Merge pull request #22 from FHNW/master

Use newer version of bootstrap to make tests (travis-CI) work again
Merge remote-tracking branch 'collective/master'