Active/Inactive Cities
Fix måerge
Fix page reload on busquedas links 
Merge branch 'master' of github.com:rogr/milhouse

* 'master' of github.com:rogr/milhouse:
  grafica