Fixed javadoc typos.
Fixed javadoc typos.
Merge remote-tracking branch 'upstream/master'
removed charliePlugins from charlie folder/updated charlie from original repo