Brought the app up to speed

Conflicts:
	pmgmt/app.py