Merge branch 'master' into mixture
Merge branch 'develop' into mixture
Merge branch 'develop' into mixture
Add mixture application definition, settings and ViM modeline.
Merge branch 'mixture' into develop