typfout

typfout
Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/app/views/layouts/default.blade.php