code cleaning
Merge branch 'features'

Conflicts:
	.pydevproject