updates
Merge branch 'master' of https://github.com/iPlanGroup/iPlan

Conflicts:
	.classpath