Shihab: office modification 17.12.2014
Merge origin/master

Conflicts:
	app/storage/logs/laravel.log