Upgrade bundled gradle to the latest
Refactor how session tokens are set
Merge branch 'master' of github.com:ushahidi/Crowdmap-Java