Requisitos 70%
Revert "Requisitos 70%"

This reverts commit 1203caa4c87a9c4cd8ccd4415f499397d97e488f.
Revert "Revert "Requisitos 70%""

This reverts commit b0de34a5a0e247ba471e5e3c5c51a222b2a68d1c.
Merge commit 'db903e8d4e01da92a7a2da0540bd39376bbd43ab' into masterRemote
Merge commit '2c2d259c4ce203494f8d45429196e64bd85ab347' into masterRemote
Merge commit 'c5936e442b63e9d2b0617dc207d713567cc2a6a4' into masterRemote
Merge commit '106eb36fd85c94b5488d7d59e2a25ce01bb175f6' into masterRemote
Requisitos 70%
Merge commit '92460a2db43ede844dccd880966de32ffc2a0164' into masterRemote

Conflicts:
	nbproject/build-impl.xml