trash
fix
rbac in shop menu added
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
fix gallery
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
gallery fixes
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
fix
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
properties special chars fixed
merge commit
Bug's pack #2
more Bug's pack 2
elrte and others
Merge branch 'master' of github.com:imagecms/ImageCMS into zbirka_pro

Conflicts:
	application/modules/shop
Merge commit 'f84af97e0dbd8f6ea7f895dc315d25f04fe0a0d2'
wtf changes commit????
sql fixed
Merge branch 'master' of github.com:imagecms/ImageCMS into zbirka_pro

Conflicts:
	application/modules/shop