Final Demo version v2
small changes
merge conflicts
updated howto page for update notes