Merge pull request #47 from baasbox/master

update from origin master
did not work when evolving from a 0.7.0 db
Merge branch 'issue_195'
Merge branch 'master' of https://github.com/giastfader/baasbox
Merge pull request #467 from giastfader/master

New patch for issue #195
Merge pull request #26 from baasbox/master

pull from repository baasbox