Merge pull request #1 from deniszgonjanin/master

WET button styles
updating overriden templates to reflact changes in CKAN branch release-v2.0