commiting to merge with remote origin
merged
adding jersey testing framework