move templates to js script
removed templates from html
Fixed getting templates for views
Update make file
make minify
Merge branch 'master' into requirejs

Conflicts:
	Makefile
	app/static/js/views.js
	app/static/js/views.min.js
	app/templates/index.html