redoing previous commit
Merge branch 'master' of github.com:onstutorial/onstutorial

Conflicts:
	net.beaconcontroller.FVexercise/bin/net/beaconcontroller/FVexercise/fvexercise.class