Merge branch 'pu' into builder_config

Conflicts:
	org.erlide.libs/src/org/erlide/annotations/Memoize.xtend