elapsed time widget added
elapsed time
merge
Merge branch 'master' of https://github.com/cmuellerrr/kadARbra

Conflicts:
	res/layout/activity_procedure.xml
	res/values/styles.xml
	src/edu/cmu/hcii/novo/kadarbra/page/StepPage.java