Commit before pull down forrest's updates
Merge branch 'development' of https://github.com/mailcrunch/deployment into development

Conflicts:
	client/home/home.tpl.html
Commiting before merging with master