Merge develop

Conflicts:
	web/index3.xml
Merge develop

Conflicts:
	web/index3.xml
Merge develop

Conflicts:
	web/index3.xml
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
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
Merge develop

Conflicts:
	web/index3.xml
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
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
Merge ivan into jonaMerge

Conflicts:
	index.html
Merge ivan into jonaMerge

Conflicts:
	index.html
tienda