Merge pull request #13 from jmaciasportela/develop/maci

Init
Commit de prueba
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch develop/fer
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	deleted:    marika.txt
Eliminar uno de los dos mensajes de alert que aparecian al pinchar en el
boton back de la ventana principal.
Barra de refresco configurable a través de atributo del JSON para las
vistas "list" y "listMarket".
Añadir MapView

	modified:   Resources/modules/NavigationController.js
	modified:   Resources/modules/controlWindow.js
	modified:   Resources/modules/initFlow.js
	modified:   Resources/ui/actions/actionFactory.js
	modified:   Resources/ui/contents/marketContentElements.js
	modified:   Resources/ui/mainUI.js
	modified:   Resources/ui/mainWindow.js
	new file:   Resources/ui/refreshBar.js
	modified:   Resources/ui/views/listMarketView.js
	modified:   Resources/ui/views/listView.js
	new file:   Resources/ui/views/mapView.js
Merge pull request #14 from jmaciasportela/develop/fer

Develop/fer
prueba