Added Controllers and View
Merge branch 'master' into ListController