Dev to Master merge

Final documentaton / javadoc commits.