Merge branch 'labeling_configurable_be'
Merge branch 'master' of https://github.com/janpolowinski/rvl
Merge branch 'master' into refaktoring_java