Merge origin/lionel

Conflicts:
	index.php
Merge origin/master
model + CRUD added
Merge origin/master