- step 4 extra questions should work properly now
Merge origin/master

Conflicts:
	www/js/controllers.js