Merge branch 'remoteBootstrap' into adam

Conflicts:
	app/beans/ServerBootstrapperImpl.java