Merge origin/master

Conflicts:
	app/models/Organization_Settings.php
	app/storage/logs/laravel.log