- minor formatting
- Modularized settings file
- Ignore local settings
Fixed ignores
Merge remote-tracking branch 'upstream/master'

Conflicts:
	civdj/pbspy/views.py
Fixed remaining merge conflict
Rename mod folder.
Fix login issue due long udp packet.
Fix player count in game listing again.. how did that get lost?
- minor formatting
- minor format
- finished player counting
- minor format
- added player_finished stuff
- Improved color cross visibility
Add missing folder 'v2'
PBSpy: Extend manage game site with form to set short names.
(setShortNames). This feature manupulates the login screen of a PB game.
PBStats: Add description strings for the login fix in the webinterface.
Merge branch 'PBMod_v2' of https://github.com/YggdrasiI/PBStats into tmp2
PBSpy: Fix issue due filtering by player. Now, __ingame_id insteead of
  __id will be used.
PBSpy: Add filtering by rounds. This values will be stored in a session
value as reative offsets. Default range is [current round, last round].
Merge branch 'master' of https://github.com/Zulan/PBStats

Conflicts:
	civdj/pbspy/views.py