Showing dummy form
Upgrading laravel to 4.2
Publishing config
Administrator page visible
Adding basic config for users
Adding user administration
Merge branch 'origin/mss-dev'

Conflicts:
	app/config/app.php
	composer.json