Fixed Tijs's changes to Invoice Generator (so that it doesn't cause exceptions, at least it generates something inaccurate now) and fixed JAX-RS
Merge branch 'master' of https://github.com/tijs14tijs/ROAD