Added subscription views
Merge branch 'master' of github.com:OPENi-ict/dao