Moved category action_index view.
Moved location action_index/action_update views.
Merge remote-tracking branch 'upstream/master'
Merge pull request #989 from oliverds/master

A couple of enhancements