Importing some changes Haoyi made to the development branch (but we couldn't merge to the Student_Trial branch without all the other changes). Also fixing a couple of test classes after UF upgrades
Merge remote-tracking branch 'origin/Student_Trial' into Student_Trial

Conflicts:
	user-agent/user-agent-Bundle/src/test/java/org/societies/useragent/feedback/TestUserFeedback.java