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

Conflicts:
	Gruntfile.js