Merged commandline and hibernate-migration into one branch, fixed some of the JSON and lombok annotations