split email from shibbolet because ucla has two value in it
Merge branch 'development' into stage
Merge branch 'stage'