Fixed lots of broken things, implemented preliminary camera.
Merge origin/master

Conflicts:
	Robot2014-mule/src/edu/wpi/first/wpilibj/templates/Camera4672014.java