demo upgrades
Merge branch 'devel' of https://github.com/vsem/vsem into devel