allow for determining view coverage
[#696 state:resolved] add help ? for team consultations
make cucumber strict, remove merge cruft
fix statistics and improve performance 20x
Merge branch 'back_to_prototype'

Conflicts:
	app/models/user.rb
Merge branch 'master' into saucelabs