change config
Merge branch 'haha'

Conflicts:
	cloud-web/src/main/webapp/WEB-INF/pages/index.html