Further preparation for the restructuring the database access in the code.
Merge branch 'master' of github.com:b0wter/audiodroid