ajustes a plataforma
Merge branch 'master' of https://github.com/hectormao/admin.git

Conflicts:
	admin/src/com/data3000/admin/cnt/TablaDatosCnt.java
	admin/src/com/data3000/admin/dao/PlataformaDAO.java