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

report controllers
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig