Fix javascript.
Merge pull request #113 from timplunkett/streamline-js

Streamline javascript
Merge branch '7.x-2.x' of https://github.com/SU-SWS/open_framework into 7.x-2.x