merge
Merge branch 'userstory76' of github.com:imagecms/ImageCMS into userstory76

Conflicts:
	templates/administrator/js/scripts.js
	templates/administrator/main.tpl
	templates/commerce/shop/default/category.tpl
vardump+gifts
roles and users
merge commit
base category tree
Merge branch 'userstory76' of github.com:imagecms/ImageCMS into userstory76

Conflicts:
	templates/administrator/js/scripts.js
merGE US 76 and master
calendar fixed
merging branches
Merge US76 and master
bugfix
Merge branch 'master' of github.com:imagecms/ImageCMS into userstory77