Merge pull request #262 from nishedcob/master

actualizar rama nishedcob-nyx
Merge branch 'nishedcob-nyx' of /home/nyx/DataEnCrypto with conflicts.
Merge remote-tracking branch 'origin/nishedcob-nyx' into nishedcob-nyx

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/nishedcob-nyx' into nishedcob-nyx

Conflicts:
	.idea/workspace.xml
Anadir contructores a Llave_Invalido_Exception
Implimentacion del Proceso en DataEnCrypto_GUI_Avanzada (parte 3)
Implimentacion del Proceso en DataEnCrypto_GUI_Avanzada (parte 3.1)
Merge pull request #263 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #265 from nishedcob/master

actualizar rama jose luis