hola
Merge branch 'master' of https://github.com/shkz/gmncontrolpanel

Conflicts:
	adminPanel.html
Merge branch 'master' of https://github.com/shkz/gmncontrolpanel
Merge branch 'master' of https://github.com/shkz/gmncontrolpanel
csm
Merge branch 'master' of https://github.com/shkz/gmncontrolpanel
Fin Info Srv
Info Srv FIN
Merge branch 'master' of https://github.com/shkz/gmncontrolpanel