added market class
merging after added map activity
Merge remote-tracking branch 'origin'