JSON hinted
JSON hinted
Merge branch 'dev' into feature-jsonhint

Conflicts:
	public/styleguide/js/code-viewer.js
Merge branch 'feature-jsonhint' into dev