Merge branch 'master' of git://github.com/collectionspace/ui
Merge remote-tracking branch 'cspace-deployment/master' into ucb-deploy