Minor modifications on server
Merge problems fidgeting
More merge fidgeting
More fidgeting
Merge fidget
Merge branch 'master' of https://github.com/gdsp/gdsp

Conflicts:
	gdsp/urls.py
Fixed small bug in pan.inc