change title
Merge remote-tracking branch 'houselove/master'

Conflicts:
	views/header.html