Fixed HR not clearing
Merge branch 'master' of ssh://cmsdev/data/marketing/git/uw-2014 into kilianf
added in-box/tile styles for mini blogroll
added compiled blogroll styles for use in tile/box
Merge branch 'master' of ssh://cmsdev/data/marketing/git/uw-2014

Conflicts:
	style.css
LDAP changes.
Sorting directory alphabetically
Bug fix for directory search.
Adding online gifts to allowed iframes.
Passing url query string to iframe
Adding more allowed iframe domains.