router fixed.
templates update
Merge branch 'master' of https://github.com/kevadsett/Campaignr

Conflicts:
	app/public/js/views/templates/templates.js