Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home.blade.php
	public/css/module.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home.blade.php
	public/css/module.css
* Added header and footer to the layout used for emails.