commit hecho por Delia
Merge remote-tracking branch 'origin/Login-and-Registration' into cferrer

Conflicts:
	app/controllers/accountController.php
	app/views/site/forms/search.php
	html/public/js/app/site.js
Arreglado JSON doctores
Merge branch 'cferrer' of https://github.com/colmenadeideas/BS-CA into cferrer
Merge branch 'cferrer' into Login-and-Registration
Creason de json de doctores
creacion json de doctores
forced commit
Merge branch 'cferrer' into Login-and-Registration

Conflicts:
	app/models/doctorModel.php
	app/views/site/forms/search.php
	html/public/js/app/site.js
	includes/libs/Functions.php