rien
Merge branch 'master' of https://github.com/Azurix78/shopishop

Conflicts:
	app/View/Layouts/admin.ctp