Added new templates
Merge remote-tracking branch 'hanne/master'

Conflicts:
	templates/_base.html