Juanjo- Gestion de permisos.
Merge juanjo

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/java/net/daw/control/operation/generic/implementation/ControlOperationGenImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/ObjetoDaoGenSpImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/OperacionDaoGenSpImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/PermisoDaoGenSpImpl.java
Arreglo del sistema de permisos
Merge juanjo

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/java/net/daw/control/operation/generic/implementation/ControlOperationGenImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/ObjetoDaoGenSpImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/OperacionDaoGenSpImpl.java
	src/main/java/net/daw/dao/generic/specific/implementation/PermisoDaoGenSpImpl.java
Arreglo del sistema de permisos 2
Merge pull request #30 from juanjomb/master

juanjo-Gestión permisos
Merge origin/master