m
Merge branch 'develop' of github.com:Stolz/laravel into develop

Conflicts:
	composer.json
Login form with Zurb foundation
m
Gettext