subscriptions edit view
Merge branch 'views2' into development