added more model
Merge remote-tracking branch 'origin/mercury' into mercury

Conflicts:
	src/main/java/com/aguacate/send2cuba/restful/model/type/BaseType.java
	src/main/java/com/aguacate/send2cuba/restful/model/user/Permission.java