formatted clean up, delete unused file
improve command line handling
Merge remote-tracking branch 'origin/develop'

Conflicts:
	pom.xml