Override app config in your dev environment.
Any configuration in modulusui-dev-conf.js will override the app's main config file.
Watching enabled for html and config files
Merge branch 'MOD-55'

Conflicts:
	Gruntfile.js
Merge branch 'master' into MOD-56

Conflicts:
	.gitignore
Logout user when token has expired upon page load
Moved app auth code to AuthService, route security
Login flow using $route.reload instead of refresh
Switched from ng-route to ui-router here on out
Route security: moved code to routeSecurity.js