Fusion BD con frontend y backend
Sin errores de compilacion
Merge branch 'Development' into M&M's

Conflicts:
	app/business/AdminONGService.java
	app/business/EmployeeService.java
	app/business/GeneralAdminService.java
	app/business/GeneralService.java
	app/business/impl/AdminONGServiceImpl.java
	app/business/impl/EmployeeServiceImpl.java
	app/business/impl/GeneralAdminServiceImpl.java
	app/business/impl/GeneralServiceImpl.java
	app/business/impl/adminONG/AddDoc.java
	app/business/impl/adminONG/AddExternalSource.java
	app/business/impl/adminONG/AddUserONG.java
	app/business/impl/adminONG/DeleteUserONG.java
	app/business/impl/adminONG/ListUploadDocs.java
	app/business/impl/adminONG/ListUploadUsers.java
	app/business/impl/adminONG/UpdateExternalSource.java
	app/business/impl/adminONG/UpdateUserONG.java
	app/business/impl/employee/AddDoc.java
	app/business/impl/employee/AddExternalSource.java
	app/business/impl/employee/ListUploadDocs.java
	app/business/impl/employee/UpdateExternalSource.java
	app/business/impl/general/LogedUser.java
	app/business/impl/generalAdmin/AddDoc.java
	app/business/impl/generalAdmin/AddExternalSource.java
	app/business/impl/generalAdmin/AddUser.java
	app/business/impl/generalAdmin/DeleteONG.java
	app/business/impl/generalAdmin/DeleteUser.java
	app/business/impl/generalAdmin/UpdateExternalSource.java
	app/controllers/Login.java
	app/controllers/Register.java
	app/models/AbstractOrganization.java
	app/models/UploadDocs.java
	app/persistence/AdminONGFinder.java
	app/persistence/EmployeeFinder.java
	app/persistence/GeneralFinder.java
Merge pull request #16 from Arquisoft/M&M's

M&m's