Merge branch 'master' of github.com:HubertJedrzejek/laravel_my_base

Conflicts:
	.idea/workspace.xml
	composer.json
Merge branch 'master' of github.com:HubertJedrzejek/laravel_my_base

Conflicts:
	.idea/workspace.xml