Adding new packages, new classes, main method.
Merge branch 'master' of https://github.com/ithillel/JOYDi.git
+Criteria