Merge branch 'pu' into builder_config

Conflicts:
	org.erlide.core/src/org/erlide/core/internal/builder/MakeBuilder.java
	org.erlide.core/src/org/erlide/core/internal/builder/RebarBuilder.java
	org.erlide.kernel.tests/src/kernel_tests.erl
	org.erlide.model.api/src/org/erlide/engine/model/root/ErlangProjectProperties.java
	org.erlide.model.api/src/org/erlide/engine/model/root/IErlProject.java
	org.erlide.model.api/src/org/erlide/engine/model/root/ProjectPreferencesConstants.java
	org.erlide.model/src/org/erlide/engine/internal/model/root/ErlProject.java
	org.erlide.model/src/org/erlide/engine/internal/services/search/ErlideOpen.java
	org.erlide.ui.tests/src/org/erlide/ui/tests/ContentAssistTest.java
	org.erlide.ui/src/org/erlide/ui/properties/ErlangProjectPropertyPage.java