Merge pull request #1 from marbindrakon/develop

Updating from upstream
Merge pull request #2 from marbindrakon/develop

Import: Add final C4 statics from Calaretu's listing
Merge pull request #3 from marbindrakon/develop

Updating from upstream
testing stuff
Merge remote-tracking branch 'origin/develop' into develop
testing 2
remove tests
Code cleanup.
Reformatted code improving readability, much more cleanup, made some variables global, optimized some jQuery usages, refactored some functions for consistency.
Merge branch 'develop' of https://github.com/marbindrakon/eve-wspace into develop

Fixed conflicts:
	evewspace/Map/static/js/map_functions.js
Undelete accidentally removed files.
Added eve-scout.com to intel list for Thera.
Merge pull request #4 from marbindrakon/develop

Pulling from origin.
Merge branch 'develop' of https://github.com/acdervis/eve-wspace into develop
Changed eve-scout conditional to use id instead of class for future-proofing.
Member removal from group menu

Members now able to be removed from a group from the group menu, js
hides that user’s row instead of reloading page.
Merge pull request #111 from SnowJP/develop

Member removal from group menu
Merge pull request #110 from acdervis/develop

Added eve-scout.com to intel list for Thera.
Merge pull request #108 from Zumochi/develop

develop