Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
old database class removed
odbc database class added
Revert "odbc database class added"

This reverts commit 48f7c66c5a9447d93a664d9c44fdc47814305493.
Revert "old database class removed"

This reverts commit 110241cdb13f8f44f2b17bf63bbd19c12d402f13.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'