Renamed view js to match naming convention.
Merge branch 'issue-15' into develop