Project config repaired (bis)
User Repository useless folder clean
Merge branch 'master' into imagefix

Conflicts:
	UserRepository/.settings/org.eclipse.wst.common.project.facet.core.xml