Merge branches 'develop', 'feature/analysis' and 'master' of github.com:basdenooijer/solarium into develop
