made server changes
Merge branch 'master' of https://github.com/Pennvention/pvapp

Conflicts:
	pvapp/routes.py
local changes