fixes
Merge branch 'master' of https://github.com/Grapheme/upk-laravel

Conflicts:
	app/views/templates/default/header.blade.php