Database.java updates
Merge branch 'master' of https://github.com/larsfk/Fellesprosjekt
Database.java updates