-
Merge branch 'master' of https://github.com/UnaCloud/unacloudIaaS2.0.git

Conflicts:
	unacloudIaaS2.0/Unacloud2.war