Merge branch 'pu' into builder_config

Conflicts:
	org.erlide.ui/META-INF/MANIFEST.MF