- Step 5: standard questions added
Merge origin/master

Conflicts:
	www/js/controllers.js
	www/js/services.js