Merge branch 'master' into develop

- Updated new develop version label
- Incremented database build number

bin/dev/make_credits.py

@@ -29,7 +29,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 #  this script is in the /util sub-directory of the friendica installation
 #  so the friendica path is the 0th argument of calling this script but we
 #  need to remove the name of the file and the name of the directory
-path = os.path.abspath(argv[0].split('util/make_credits.py')[0])
+path = os.path.abspath(argv[0].split('bin/dev/make_credits.py')[0])
 print('> base directory is assumed to be: '+path)
 #  a place to store contributors
 contributors = ["Andi Stadler", "Ratten", "Vít Šesták 'v6ak'"]

bin/run_xgettext.sh

@@ -48,7 +48,7 @@ case "$MODE" in
 		OUTFILE="$FULLPATH/../util/messages.po"
 		FINDSTARTDIR="."
 		# skip addon folder
-		FINDOPTS="( -wholename */addon -or -wholename */addons-extra -or -wholename */smarty3 ) -prune -o"
+		FINDOPTS="( -wholename */addon -or -wholename */addons -or -wholename */addons-extra -or -wholename */smarty3 ) -prune -o"
 		
 		F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ./boot.php);
 		echo "Friendica version $F9KVERSION"