Update the questionnaire view, add delete and edit
change file name
resolve conflict

* 'master' of https://github.com/nalarfag/GWU_Builder:
  Role
  Changes
  added return values to saveCondition
  duplication func

Conflicts:
	GWUQuestionnaire.php
	GWUQuestionnaireAdmin.php
	GWU_Builder.php