Added more tests and fixed bugs related to adding / editing request types
Merge branch 'master' into django17