d
changes to sqlite helper functions
Merge remote-tracking branch 'origin/Devbranch1'

Conflicts:

proj.ios_mac/UniLife.xcodeproj/project.xcworkspace/xcuserdata/csci321ga2
a.xcuserdatad/UserInterfaceState.xcuserstate