Merge branch 'feature/8_jsviews' into integration
Merge pull request #29 from ltfschoen/integration

Merge branch 'feature/8_jsviews' into integration