Tests and fix for #211
Merge branch 'pr/212' into fix120

Conflicts:
	app/test/clj/io/pedestal/app/test/templates.clj