Merge branch 'origin/develop'
add questionnaire
fix image on android show，add response.contentType = "image/jpeg"
grails upgrade 2.3.4
Merge branch 'origin/master'