Merge remote-tracking branch 'upstream/master'

Conflicts:
	blogs/inc/collections/views/_coll_perm_view.funcs.php
	blogs/inc/items/views/_item_history_compare.view.php
	blogs/inc/regional/model/_regional.funcs.php
	blogs/inc/tools/model/_phpbb.funcs.php
	blogs/inc/tools/model/_wp.funcs.php
	blogs/inc/tools/views/_email_settings.form.php
	blogs/inc/tools/views/_wpxml_file.form.php
	blogs/plugins/test_plugin/_test.plugin.php
	blogs/skins/forums/_front.disp.php
	blogs/skins/forums/_item_block.inc.php
	blogs/skins/forums/_posts.disp.php
	blogs/skins/forums/_search.disp.php
	blogs/skins/forums/index.main.php
	blogs/skins/manual/_body_header.inc.php
	blogs/skins/pureforums/_item_block.inc.php
	blogs/skins/touch/posts.main.php
Translation update
Calendar footer fixes