added update to status
Merge branch 'master' of https://github.com/jrpharis/autoPi_Hardware

Conflicts:
	camera.pyc
	gui.pyc