Merge pull request #2 from RandomPwning/develop

i added a space
adding users to db
adding users to db
adding roles to data base and fixing conflict in config