20_05_2013_1
Merge branch 'development' of github.com:imagecms/ImageCMS into development

Conflicts:
	application/modules/shop
	templates/administrator/js/scripts.js