Finish update of market to creative
Merge branch 'development' into john-dev