Started changes to sdk
Updated java sdk.
Added new traits and tests for them.
Added comments and added example to readme.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md