Initial commit
Merge branch 'master' of github.com:devdbsoare/ummode2

Conflicts:
	app/config/config.ini
	app/main.php
	app/services.php