2 digit result refs:#706
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	db/schema.rb