add package of demo pages
changes for local ENV
环境整合
环境整合
Merge remote-tracking branch 'remotes/lixl/master' into lixl

Conflicts:
	admin-portal/src/main/java/com/ericsson/ssdo/Application.java