Jds dswebview merge

Manual web merge of Dustin's view controllers.