HACK capa timed-test on capa_base.py

Conflicts:
	common/lib/xmodule/xmodule/capa_base.py
	lms/templates/problem.html
Merge pull request #70 from Stanford-Online/jbau/timed-exam-hack

HACK capa timed-test on capa_base.py