angularjs version
deleted unnecessary directory.
Merge branch 'src-angular' into src

Conflicts:
	.bowerrc
	.editorconfig
	.gitignore
	.jshintrc
	Gruntfile.js
	app/.htaccess
	app/404.html
	app/index.html
	app/robots.txt
	app/styles/main.scss
	bower.json
	dist/.htaccess
	dist/404.html
	dist/index.html
	dist/robots.txt
	package.json