added id assertion to tests
Merge branch 'master' into development
Merge branch 'master' into development
added role system and changed some columns to not null