commit conflict file from gitdemo4
Merge branch 'master' of https://github.com/lephuongbac/gitdemo.git

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