imac first commit
Merge branch 'master' of https://github.com/chigenius/softquest_dev

Conflicts:
	softquest_training/includes/config.php
	softquest_training/includes/initialize.php
	softquest_training/public/index.php