Added feature to create conditions for branching
Merge branch 'master' into create_branching_condition

Conflicts:
	GWUQuestionnaireAdmin.php
Merge pull request #1 from nalarfag/create_branching_condition

Create branching condition