updated version.
Merge branch 'master' into free_demo

Conflicts:
	bar-descriptor.xml
Demo is ready now.