added default role and subscription
Merge branch 'dev'