Grunt build
Merge branch 'development'
Merge branch 'master' of 192.168.1.103:git/freebike-app into development

Fix merge conflicts

Conflicts:
	dist/manifest.appcache
Merge branch 'development'

Conflicts:
	dist/manifest.appcache
Grunt build
Merge branch 'development'