Refactoring
A little more refactoring
More work on db structure and db related code
More testing
More testing
Merge branch 'develop'