Merge origin/ivan into jona

Conflicts:
	css/style.css
	css/style.css.map
	index.html
	js/cargarDatosIniciales.js
	js/jquery/jquery-1.10.2.js
	php/ConnectionFactory.php
	php/GenericDAO.php