Shihab 2.27 pm = Edit organization modified
Merge origin/master

Conflicts:
	app/storage/logs/laravel.log