move mobile expire_action back to locations controller, add /
Merge branch 'enhancements'