Updated graphic inview event and updated templates
Merge branch 'develop'

* develop:
  Updated graphic inview event and updated templates

Conflicts:
	templates/graphic.hbs