Merge origin/master

Conflicts:
	src/main/java/com/web/panacea/controller/PromotionRequestController.java