quick fixes
Merge branch 'master' of https://github.com/haslab/echo

Conflicts:
	src/pt/uminho/haslab/echo/plugin/properties/ProjectProperties.java