orders done
orders fix
fix
Merge branch 'development' of github.com:imagecms/ImageCMS into development
fix bugs
fix bugs
20_05_2013_1
Merge branch 'development' of github.com:imagecms/ImageCMS into development

Conflicts:
	application/modules/shop
	templates/administrator/js/scripts.js
20_05_2013_03
20_05_2013_04
gift delete in orders
Merge branch 'development' of github.com:imagecms/ImageCMS into development
20_05_2013_05
Merge branch 'development' of github.com:imagecms/ImageCMS into development
20_05_2013_06
20_05_2013_07
orders
Merge branch 'development' of github.com:imagecms/ImageCMS into development
20_05_2013_07
Merge branch 'development' of github.com:imagecms/ImageCMS into development