merge kb with master

added survey edit view with the following features:
 links to add question, send out the survey, view the survey results, and preview the survey,
proposed controller route: /surveys/:id/edit
@jmyers0022  @bhancock96