main

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	market/src/main/java/com/gracelogic/platform/market/service/MarketService.java
#	market/src/main/java/com/gracelogic/platform/market/service/MarketServiceImpl.java