merged devel changes into bootstrap
Merge branch 'bootstrap' of github.com:devsnd/cherrymusic into bootstrap