Updated DataController, Model and Database
removed a todo-line
Merge branch 'master' into anton
Updated DataController and changed the system accordingly
Added IO to model
Updated with working login screen
Fixed merge conflicts