modificado netbeans
commit mce
Merge branch 'master' of https://github.com/davidsaavedra/fusmc

Conflicts:
	administrator.php
conflicto