finalised tests for user authorization methods
finalised authorization; built tests on the model level; will start writing controller authorization blocker later
resolved merge conflict
Merge branch 'master' into admin
integration tests fixed
votes controlled renamed, original files no longer needed
Merge branch 'master' into admin