Merge branch 'develop' of git://github.com/phpBB-Social-Network/phpBB-Social-Network into develop

Conflicts:
	install_instructions/update_from_0.7.2_to_0.7.3.xml