added take survey page and form
user can take a survey and submit result
fixed merge conflicts
Merge branch 'master' into anthony
merge master into anthony to bug check
Merge branch 'anthony'
add in all additions from anthony