Merge branch 'master' into uiuc_merge
Made a little more room for the location switcher text. Fixes SPOT-861.
Expanded the space for campus name a little more as it was still getting cut off in IE.
Merge branch 'uiuc_merge'