Bar and marketplace added
Merge pull request #570 from mentatzoe/master

Bar and marketplace added