Merge branch 'master' of https://github.com/lephuongbac/gitdemo.git

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

Signed-off-by: Le Phuong Bac <chimen@gmail.com>