Merged stuff from Thinktecture and updated to jwt 4.0.0-beta2
Merge