nueva vista principal
Merge branch 'master' of https://github.com/sdonik/PrismaNet.git

Conflicts:
	.classpath
subo ellook and feel