Presentation version for 6.2
Merge branch 'denny' into dev

Conflicts:
	InteractionTest1/src/gestures2/Globe.java