Merge pull request #1 from leonjones1974/feature/server-checkin-jersey

Feature/server checkin jersey