Updated to be conform to new server setup
Merge remote-tracking branch 'origin/master'

Conflicts:
	laravel/app/config/site.php