Fixed issue with resetting the views on rerendering
Merge branch 'master' of github.com:encorelab/CommonKnowledge