Further work on RestApi setup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ImagePail/src/main/java/edu/gatech/cs4261/wheresdabeef/camera/CameraManager.java
Merge branch 'master' of https://github.com/j3gb3rt/PictoCache