integrate ALL the things
Merge branch 'master' of https://github.com/padenot/mhdberlin14