Role Maintenance
Dev config changes
Merge branch 'master' into SevenStone-Suresh-Development
Add/Delete Roles