some composer.json changes and formatting
Merge branch 'dev' of git@github.com:FrozenNode/Laravel-Administrator.git into dev
Merge branch 'dev' of git@github.com:FrozenNode/Laravel-Administrator.git into dev
Merge branch 'dev' of git@github.com:FrozenNode/Laravel-Administrator.git into dev
modifying PR #373 to better account for all situations