fixed issue with inserting $$hashkey into database json, small changes
to templates
Merge branch 'master' of https://github.com/roberthorn/flaming-wookie

Conflicts:
	models.go