latest changes
Merge branch 'master' of https://github.com/cseslam/faselty

Conflicts:
	app/views/layout.blade.php