before merge wit yura
Yuras changes accepted
Shop Menu
Add scripts fix
merge with o/m
after merging
sql updated
zbirka
Merge remote-tracking branch 'origin/userstory83'
tinymce saving fixed
Merge branch 'master' of github.com:imagecms/ImageCMS
small fixes
Merge 83 with Master
Merge remote-tracking branch 'origin/master'
Merge
Push menuBase
Merge 83 with master
shop widgets
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	templates/commerce/shop/default/main.tpl
calendar fixed again