Fixed bug with adaptModel lockedAttributes hash

- Also added fixed to trickle _isEnabled
Merge branch 'develop' into issue/#300

* develop:
  Updated hotgraphic sample image
  Fixes #268
  issue #214 fixed

Conflicts:
	src/core/js/models/adaptModel.js