changed class of main controller
removed leftover xib
more changes to database access
Merge branch 'refactored'
project changed