Merge branch 'master' into dev

Conflicts:
	resources/config/prod.php