Refactor: ApplicationController

Extracted some private methods and restructure the conditional for #store_location
Merge pull request #191 from cored/application-controller

Refactor: ApplicationController
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into without_users
pulled back in old changes, and upstream develop
Merge branch 'without_users' into navbar_admin
merge without_users, fixed bug in path for cuke assertions