minor changes

minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	scaha/.classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	scaha/.classpath