User model
composer el la3en
Merge branch 'master' of https://github.com/medo/elmasla7a

Conflicts:
	app/composer.json