market add view added, controller modified
Merge branch 'development' into john-dev