-n 
dist
-n 
dist require
Merge branch 'develop'

Conflicts:
	.jshintrc
	.travis.yml
	Gruntfile.js
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/about.js
	app/scripts/controllers/main.js
	bower.json
	dist/index.html
	index.html
	karma-e2e.conf.js
	package.json
removing all
removing all
Removing all
ex
Merge branch 'master' into develop