Merge pull request #987 from oliverds/master

A couple of bug fixes & enhancements
Merge pull request #988 from oliverds/master

Login attempts
Moved category action_index view.
Moved location action_index/action_update views.
Merge remote-tracking branch 'upstream/master'