org.json package added
Merge branch 'master' of https://github.com/bennyty/speedGIT

Conflicts:
	SpeedCoach/src/com/lehmannsystems/speedcoach/Boat.java