Fixed issue with infinite loop when reading multiple ORM objects from a cursor.
Cleaning up Strings.xml and View/Edit layout naming inconsistencies.