merging prod changes
adding multiple add email functionality
admin landing page
merging from prod
final checkin