moving around underscore templates
Merge branch 'master' of https://github.com/jpoyzner/Mapreport.git

Conflicts:
	js/views/Console.js
changes