Clean code
Merge branch 'master' of https://github.com/Zulan/PBStats into tmp

Conflicts:
	civdj/pbspy/views.py
Minor improvements on both webinterfaces.
Merge branch 'master' of https://github.com/Zulan/PBStats

Conflicts:
	civdj/pbspy/views.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	civdj/pbspy/views.py