Built and tested javascript_module
Merge branch 'development'