first commit jerseyutil
fixed gitignore conflict