some changes to make it work
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExpertShell/.classpath