Merge branch 'dev'
Added drop down list to question form
Removed error '+' symbols
Removed hard coded question type
Test case updated
update view on dropdownlist change
Revert "update view on dropdownlist change"

This reverts commit 94d155332f37a2bf63e27df2d90e28fae5194ee3.
Merge branch 'master' into design
Added comments per PHP Doc to Views
Update to db answer table and survey answer model
Partial answer form complete
Add function to add new answers through new page
Changed the question form labels for choices
Fixed error on choice delete
Multiple fixes, now 2 types of questions
Update UI for Survey Editor page
Fix button styles on log in / register page
Merge branch 'Multiple-choice-dev' into design
Update button styles on Survey Editor page
UI updates to Create Survey Question page