Modularise root state
Set parent index state on top-level childs
Fix karma invocation
Remove superfluous top-level mocks
Beautify app.js
Move footer ctrl into state definition
Bump grunt-contrib-concat, ref item:356
Merge pull request #177 from tlvince/refactor/rm-top-level-run

Remove top-level state dependencies
Merge pull request #178 from tlvince/refactor/grunt-contrib-concat

Bump grunt-contrib-concat, ref item:356
Merge branch 'upstream-develop' into bug/notification-on-mobile

Conflicts:
	app/index.html
	app/scripts/controllers/app-config.js
merged upstream
resolved conflict after merging upstream