Merge branch 'master' into template

Conflicts:
	app/views/layouts/master.blade.php
Merge pull request #75 from hipsterwannabe/template

Template