add map controller & view
update
update market
update market
Merge branch 'master' of github.com:Evrika/Vidal