Added and tested fixes proposed by github user
Added template in demo
fixes #1636
test for set datamap
fixes #HOT-15
Merge branch 'develop' into feature/HOT-15

Conflicts:
	test/jasmine/SpecRunner.html
add recursive check
Merge branch 'feature/HOT-15' into develop
merge new demo with the old one