Merge branch 'master' of https://github.com/tr8n/tr8n_j2ee_clientsdk

Conflicts:
	README.md