Merge branch 'jamie'-finished db

Conflicts:
proj.ios_mac/UniLife.xcodeproj/project.pbxproj

accessors exist in sqlhelper class