updates to API Main/PrismAPI.py
updates to test.py
t
Merge branch 'master' of github.com:lemonprogis/prism-api

Conflicts:
	local_test.py