fixed getMessage, added table model
Merge origin/master

Conflicts:
	README.md
	build.xml