Fix improperly committed AuthorizationTest
Merge branch 'master' of github.com:bedatadriven/activityinfo

Conflicts:
	tests/api/src/test/java/org/activityinfo/test/AuthorizationTest.java