Merge remote-tracking branch 'origin/master'

Conflicts:
	MB/src/main/java/com/skcomms/openplatform/controller/MainController.java
Merge remote-tracking branch 'origin/master'