merging last production tag

 into heroslider

merged cab.styles.r11

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
adding hero slider, don't forget to move CSS into the SCSS files.
Added location update on login
style changes for slider
Merge commit 'jc.heroslider.r02' into integration
Merge commit 'dc.ldap.r02' into integration