Fixed Environment
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	.idea/deployment.xml
	bootstrap/start.php