commit conflict demo2
Merge remote-tracking branch 'origin/master'

Conflicts:
	OracleCloudDemo/src/main/java/com/fsoft/cloud/controller/HomeController.java