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

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_ecommerce_list
	app/tmp/cache/models/myapp_cake_model_default_ecommerce_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_cake_en
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
db change
admin
Merge branch 'master' of https://github.com/Azurix78/shopishop

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_ecommerce_list
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en
	app/tmp/cache/persistent/myapp_cake_core_cake_en
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log