typo
more text fixes
Merge branch 'master' into development

Conflicts:
	build.xml
added UI and thus fixed #6
this code closes #6
I just fixed #10