initial work on query replace
Merge branch 'master' of https://github.com/GeoNode/geonode into layer-replace
adjust the server response to the new uploader in layer-replace
update the integration test to reflect the new error code
Merge pull request #969 from simod/layer-replace

Use new uploader ui in layer replace
Merge pull request #968 from ppasq/css-fixing

Fixed style for stars png
icon fix for osgeolive
Merge pull request #970 from kalxas/master

icon fix for osgeolive
Merge branch 'master' of https://github.com/GeoNode/geonode into css-fixing

# By Simone Dalmasso (3) and Angelos Tzotsos (1)
# Via Ariel Núñez (2) and others
* 'master' of https://github.com/GeoNode/geonode:
  icon fix for osgeolive
  update the integration test to reflect the new error code
  adjust the server response to the new uploader in layer-replace
  initial work on query replace