1608 eng
Merge branch 'master' into austria

Conflicts:
	admin/inc/functions_themes.php
	admin/modules/style/templates.php
	admin/modules/style/themes.php
	admin/modules/tools/adminlog.php
	admin/modules/tools/mailerrors.php
	admin/modules/tools/maillogs.php
	admin/modules/tools/modlog.php
	editpost.php
	forumdisplay.php
	global.php
	inc/class_datacache.php
	inc/class_parser.php
	inc/class_session.php
	inc/datahandlers/post.php
	inc/datahandlers/user.php
	inc/db_pgsql.php
	inc/functions.php
	inc/functions_indicators.php
	inc/functions_post.php
	inc/plugins/akismet.php
	jscripts/editor.js
	member.php
	memberlist.php
	misc.php
	modcp.php
	moderation.php
	portal.php
	private.php
	sendthread.php
	showteam.php
	showthread.php
	usercp.php
upgrade
Merge branch 'master' into austria

Conflicts:
	install/index.php
	install/resources/mybb_theme.xml
	install/resources/mysql_db_inserts.php
	install/resources/mysql_db_tables.php
	install/resources/output.php
	install/resources/pgsql_db_tables.php
	install/resources/sqlite_db_tables.php
	install/resources/upgrade1.php
	install/resources/upgrade10.php
	install/resources/upgrade11.php
	install/resources/upgrade12.php
	install/resources/upgrade13.php
	install/resources/upgrade14.php
	install/resources/upgrade15.php
	install/resources/upgrade17.php
	install/resources/upgrade18.php
	install/resources/upgrade19.php
	install/resources/upgrade2.php
	install/resources/upgrade20.php
	install/resources/upgrade21.php
	install/resources/upgrade22.php
	install/resources/upgrade23.php
	install/resources/upgrade24.php
	install/resources/upgrade3.php
	install/resources/upgrade4.php
	install/resources/upgrade5.php
	install/resources/upgrade6.php
	install/resources/upgrade7.php
	install/resources/upgrade8.php
	install/resources/upgrade9.php
	install/upgrade.php