fixed conflicts and added get methods in DBhandler
Merge branch 'database' of github.com:simonjrp/ESCAPE into database