Merge "Adding some assets / fixing a couple bugs" into jb-ub-now-indigo-rose