Merge new data model

TagResource should be fixed to work according to the current model!
DB Connection uses delange.diskstation.me 'lapps_new' db!