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

Conflicts:
	.gitignore
	app/View/Layouts/admin.ctp
	app/tmp/cache/models/myapp_cake_model_default_ecommerce_pictures
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_default_en
	app/tmp/cache/persistent/myapp_cake_core_default_en-us
	ecommerce.sql