nested form
changes to dojo model
index view edits
fixing home view
resolve merge conflict