MYB-382: resolving merge issues
MYB-382: resolving merge issues

ets-berkeley-edu/3akai-ux,rhollow/MYB-1615,jonmhays/3akai-ux,ets-berkeley-edu/3akai-ux,jonmhays/3akai-ux,rhollow/MYB-1615,rhollow/MYB-1615,jonmhays/3akai-ux,ets-berkeley-edu/3akai-ux