Commit from EGit - debugging 
Commit from EGit - ACL_Desktop
Commit from EGit - ACL_Desktop
Merge branch 'progressBar' into monaco_dev

Conflicts:
	.gitignore
	ACL_Desktop/conf/beans/ProjectConf.java
	ACL_Desktop/conf/project.properties
-help