Cambios
Merge branch 'master' into openshift
Estilos
Merge branch 'master' into openshift
Novedades
Merge branch 'master' of github.com:nachoalthabe/cluster_poligonal into openshift

Conflicts:
	app/scripts/controllers/buscar_semillas.js