Fixed giving error
Merge branch 'master' of ssh://cmsdev/data/marketing/git/uw-2014 into kilianf
Bug fix for the quicklink clickable area and quicklink template changes.
Merge conflicts.