Merge branch 'master' into feature/maven

Conflicts:
	.classpath
	README.txt