added some conditions and config files
corrected branch information for composer.phar update
added general db connection params
Update composer.json
completed composer configuration file
Merge branch 'feature/game' into develop

Conflicts:
	composer.json
	config/autoload/global.php
re-merged branches to develop
Merge remote-tracking branch 'origin/develop' into develop
added blank unit module