Official X3.1 20130923
Merge branch 'master'

Conflicts:
	source/admincp/admincp_styles.php
	source/class/class_core.php