NUCJSON-48 javadoc improvements
NUCJSON-48 merge with conflicts in master