refactored locations controllers + additions to alliances views
sidebar fixes
Implemented invitations for alliances
Merge branch 'staging' of https://github.com/krsteskid/devt into staging
small fixes