type text adresse
Merge branch 'master' of https://github.com/Azurix78/shopishop

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_default_en-us