removed geoserver
added back the tilestream plugin
Merge pull request #93 from gem/template-cleaning

Template cleaning
work in progress
override maps templates
fix styling
add credentials to the proxy request
Merge pull request #94 from gem/tilestream-plugin

Tilestream plugin
Merge branch 'geonode2-integration' into icebox-getJson