js now included as needed
Merge remote-tracking branch 'upstream/develop' into js_reconfig
Merge branch 'reports_controllers' into js_reconfig
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig
Merge pull request #187 from johnnymo87/js_reconfig

JS reconfiguration