adding roles to data base and fixing conflict in config
Merge pull request #3 from RandomPwning/develop

adding roles to data base and fixing conflict in config