Re-tooling watch/follow/block API to be more amenable to caching
Merge branch 'fix_42' into test_paging_42

Conflicts:
	ehri-extension/src/main/java/eu/ehri/extension/AbstractRestResource.java
	ehri-extension/src/main/java/eu/ehri/extension/UserProfileResource.java
	ehri-extension/src/main/java/eu/ehri/extension/VirtualUnitResource.java
Use providers to handle parameter extraction of permission data
Clean up the permission resource using MessageBodyWriters for the perm types
Fix return MediaType annotations
Use MessageBodyWriters from number and boolean responses
Rename test class and add test for POST for of generic fetch
Integrate new VU scheme with web service
Make a name mandatory for auth set and vocabularies
Fix tests by adding (now-)mandatory name value
Add method to remove included units from a VU
Minor refactoring
Add WS methods to list, add, and remove DUs from VUs.
Automatically fetch VC author
Check update perms before setting include/excluded units
Tweaks to VC WS api
Add an endpoint for moving inc. units from one VU to another
trimming the cmdEntryPoint
bbwo2 beeldbank dc/europeana import added
Merge branch 'master' of https://github.com/lindareijnhoudt/ehri-rest into merge_linda