Extra control of buttons
Merge branch 'develop' of github.com:Stolz/laravel into develop