Danny Gonzalez
Added Bazaar screen and controller
Merge origin/master