Merge branch 'dev' of https://github.com/wespinosa/sysecure into dev

Conflicts:
	busqueda.php
Merge origin/dev into dev