Updating console script, and other files to reflect that change
Update utils/skeleton_module/Module.php
fixed tabs vs spaces
Merge pull request #21 from nesQuick/master

Fixed tabs in composer.json
removing phpstorm dir
Removing user module from skeleton app
Removing UserModule
Add modules/UserModule
Add composer.lock
Updated init to not duplicate composer path

No need to duplicate the code, the variable can be re-used
Merge pull request #24 from marcqualie/patch-1

Updated init to not duplicate composer path
Merge branch 'master' into 2.1

Conflicts:
	app/app.config.php
	app/console
	app/init.php
	app/modules.config.php
	composer.json