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

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

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