initial commit from angular-seed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	app/js/app.js