Merge 9b7919b into database-squashed-pullrequest
Merge branch 'devel' into database-squashed-pullrequest

Conflicts:
    README.md
    cherrymusicserver/__init__.py
    cherrymusicserver/cherrymodel.py
    cherrymusicserver/httphandler.py
Merge branch 'database-squashed-pullrequest' of github.com:tilboerner/cherrymusic into database-squashed-pullrequest