Merge pull request #14 from thatcoderguy/master

Merge changes.
added edit view and created wrapper classes - need to make the getchildren work with the new views and viewmodels
Merge pull request #16 from widagroup/master

 added edit view and created wrapper classes - need to make the getchildren work with the new views