Fixed bug in view rendering
Merge branch 'master' of github.com:mondora/mnd-website

Conflicts:
	dist/app.min.js
	dist/app.templates.min.js
Rebuilt app