Creating Applications View an Testing with Jasmine
Update App Views
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	dev/js/app.js
	dev/less/components/grid.less
	dev/less/styles.less
	dist/css/styles.css
	dist/css/styles.min.css
	dist/js/app.min.js
	gulpfile.js