Merge pull request #2 from hector3/dev

Dev
Merge pull request #5 from hector3/dev

Dev
Merge pull request #6 from hector3/dev

Relació node-company + user-company +operacions crud
Merge pull request #7 from hector3/dev

Dev
add user
Merge branch 'master' into dev

Conflicts:
	src/main/java/org/glassfish/jersey/archetypes/jersey/quickstart/webapp/CRUD.java
	src/main/java/org/glassfish/jersey/archetypes/jersey/quickstart/webapp/Company.java
	src/main/java/org/glassfish/jersey/archetypes/jersey/quickstart/webapp/MyResource.java