Fixed 'ambiguous column name' error
Merge branch 'develop' of github.com:Stolz/laravel into develop