Created a Spring-jerseyRes-AngularJs project (AngularJs still not implemented)
Merge branch 'master' of https://github.com/sergvera/javaProjects.git

Conflicts:
	CodeGenerator/input.txt
-Generated CRUD queries
-Bug fixes