commit 201405231749

Added maxNumberOfContacts and contactAtomType to atomType.