increase the maximum allowable speed. A faster speed (20kts) is necessary for scenario one.
- Correct the name value for proximity 2 course
- structure if test so that '0' value doesn't represent false.
Merge remote-tracking branch 'origin/movement-integration' into movement-integration

Conflicts:
	www/js/app/app.js
Use scenarioTime instead of tNow.