modified condition for 3740
adapted results page
Improved display of 'sub-questions'
fixed log levels
Merge remote-tracking branch 'origin/v1.0'

Conflicts:
	public/javascripts/app.js
app.js