Changes to setup
Merge branch 'master' of https://github.com/jpaulm/javafbp

Conflicts:
	.classpath