VVWM (working with Local Bottle server)
Merge branch 'jon' into sprint10

Conflicts:
	REST/REST_local/przm5_rest/PRZM5_pi_new.py
	przm5/przm5_parameters.py