Merge "clean up and add javadocs" into honeycomb