added timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/cmu/hcii/novo/kadarbra/ProcedureFactory.java
	src/edu/cmu/hcii/novo/kadarbra/page/StepPage.java
	src/edu/cmu/hcii/novo/kadarbra/structure/Step.java