Merge branch 'anonymous-mode' into ec2_solo

Conflicts:
	app/beans/ServerPoolImpl.java
	public-folder/angularApps/index.html