- Communicator stuff
- Changes.
-
Merge branch 'master' into HEAD

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/communicator/CommunicatorController.java
	muikku-core-plugins/src/main/java/fi/muikku/plugins/communicator/dao/InboxCommunicatorMessageDAO.java
	muikku-core-plugins/src/main/java/fi/muikku/plugins/communicator/rest/CommunicatorRESTService.java
	muikku-core/src/main/java/fi/muikku/controller/UserController.java
	muikku/src/main/java/fi/muikku/data/SeedDataImporter.java
Merge branch 'master' of https://github.com/otavanopisto/muikku.git