adding edit view
merging development
edit applications
edit applications view
Merge branch 'applications' into development
Merge branch 'development' of https://github.com/ging/horizon into development
Merge branch 'development' of https://github.com/ging/horizon into development