Merge branch 'master' into feature-fielddb-integration

Conflicts:
	Gruntfile.coffee
	app/scripts/main.coffee