merge
merging
Merge branch 'master' of https://github.com/cmuellerrr/kadARbra

Conflicts:
	src/edu/cmu/hcii/novo/kadarbra/ProcedureActivity.java
	src/edu/cmu/hcii/novo/kadarbra/page/StepPage.java
bad to overwrite drawChild
uncomment scrolling
Merge branch 'visuals'

Conflicts:
	res/layout/reference_video.xml
	src/edu/cmu/hcii/novo/kadarbra/ProcedureActivity.java
	src/edu/cmu/hcii/novo/kadarbra/page/StepPage.java
Added sizes to references, fixing the issue with scrollviews not
showing video.
updating some voice commands
Merge branch 'master' of https://github.com/cmuellerrr/kadARbra

Conflicts:
	src/edu/cmu/hcii/novo/kadarbra/ProcedureActivity.java
voice command stuff merge fix
extra }
Did some formatting of the video player controls.  Still not totally
there though.
Set up animated menu.  Isn't hooked up to any functionality yet though.