Please review my changes and merge

Summary of changes:

- Allow embedded id from the mapped superclass to be used during insertion and query [Fix bug wherein during insertion, an embedded id from a mapped superclass is not honored in the subclass]

- Added ability to query by primary keys + index

- Sorry about the white space changes. It seems like my Intellij has different tabbing and line separator and I must have accidentally formatted some of the classes while adding my changes.