antissoft / antis-greenway

# Conflicts:
#	pages.json
#	pages/advertisementDetail/advertisementDetail.vue
#	pages/details/details.vue
#	pages/questionnaire/questionnaire.vue
#	pages/record/record.scss
#	pages/record/record.vue