Requirejs
Merge branch 'master' of github.com:mremolt/angular-seed

Conflicts:
	Gruntfile.js
	build.config.js
	package.json
	src/index.html