Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/storage/logs/laravel.log
	app/storage/views/b828f0294b0432092a90ed73f00ebfb9