test
Merge branch 'dev' of https://github.com/hector3/beflow.git into dev

Conflicts:
	src/main/java/org/glassfish/jersey/archetypes/jersey/quickstart/webapp/CRUD.java
commit1
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
Busqueda de si existeix usuaris + delete company
Operacions CRUD OK! Amb cascada correcta de BBDD
Merge pull request #12 from hector3/dev

Dev