add entities
Merge branch 'feature/sami' into dev

Conflicts:
	src/User/Bundle/Entity/User.php