Upgraded to JavaEE 7 and Jersey 2