Work on alliances. Adding css and js caching / minifier
Merge branch 'master' of github.com:InfiniteConflict/InfiniteConflict