after re-billd 22.03.13
Merge branch 'development' of github.com:imagecms/ImageCMS into development

Conflicts:
	application/modules/shop
Pull
lists
=)===> ninja
=)===> ninja
before pull
Merge branch 'development' of github.com:imagecms/ImageCMS into development

Conflicts:
	application/modules/shop
scripts
Merge branch 'development' of github.com:imagecms/ImageCMS into development
Push orig development Base
Push orig development Base no conflict
c2
Merge branch 'development' of github.com:imagecms/ImageCMS into development
Push product BAse
Merge branch 'development' of github.com:imagecms/ImageCMS into development