Merge branch 'develop' of https://github.com/tansaku/LocalSupport into reports_controllers
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig
Merge pull request #186 from johnnymo87/reports_controllers

report controllers
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig
Merge pull request #187 from johnnymo87/js_reconfig

JS reconfiguration
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into without_users