new functions in database-class
DatabaseHelper
Merge remote-tracking branch 'origin/master'