Merge remote-tracking branch 'upstream/viewLayerFinish' into viewLayerFinish

Conflicts:
	questionApp/grails-app/controllers/com/opi/QuestionController.groovy