updates from demo
Merge branch 'master' of https://github.com/chuculba/PoC

Conflicts:
features/src/main/features/features.xml
fix conflict