When the device is "vertical" Tour Mode is displayed. When you put the
device flat, Compass mode is displayed. This is how we will switch
between the two.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ARNA/gen/edu/ycp/cs481/arna/client/ui/R.java