Merge david into develop

Conflicts:
	nbproject/project.properties
	public_html/cliente/css/index.css
	public_html/cliente/css/index.css.map
	public_html/cliente/css/navbar.css
	public_html/cliente/css/navbar.css.map
	public_html/cliente/css/responsive.css
	public_html/cliente/css/responsive.css.map
	public_html/cliente/scss/index.scss