removing unnecessary parameter from 1.0 when we dealt with tomcat-manager
removing unnecessary parameter from 1.0 when we dealt with tomcat-manager
adding username, password and endpoint to properties file for project so runner can use the coordinator fig
Merge branch 'master' of ssh://stash.safehaus.org:7999/chop/main

Conflicts:
	webapp/src/main/java/org/apache/usergrid/chop/webapp/ChopUiFig.java
Fixing merge error