**fd
** sd
** better data
** EducationTypePermissionsTests
Merge branch 'FTR-113-rights' of https://github.com/otavanopisto/pyramus.git into FTR-113-rights
*
** edtype permissionstests
sd
Merge branch 'FTR-113-rights' of
https://github.com/otavanopisto/pyramus.git into FTR-113-rights

Conflicts:
	pyramus/src/test/java/fi/pyramus/rest/AbstractRESTPermissionsTest.java
** More REST permission tests
Merge branch 'FTR-113-rights' of https://github.com/otavanopisto/pyramus.git into FTR-113-rights
** GradingScalePermissionTests, SubjectPermissionsTests improved and
EducationalTimeUnitPermissionsTests added
** ContactTypePermissionsTestsIT added
** ContactURLTypePermissionsTests added
** CoursePermissionsTestsIT added
** CourseComponentPermissionsTestsIT added
** CourseStaffMembersPermissionsTestsIT added
** CourseStudentsPermissionsTestsIT added
** Fixed CourseStaffMemberPermissionsTestIT delete test
** CourseEnrolmentTypePermissionsTestsIT added