Merge origin/infrastructure into infrastructure

Conflicts:
	CloudStar/CloudStar-war/src/java/com/cloudstar/controller/DanielServlet.java