Merge branch 'dev' of github.com:tomkralidis/geonode into wmc
Add clokins.exclude script (used with sloccount plugin in jenkins)
Merge branch 'dev' of github.com:GeoNode/geonode into wmc
Update zh translation from transifex
Merge pull request #411 from jj0hns0n/update_zh

Update zh translation from transifex
Merge branch 'dev' of github.com:GeoNode/geonode into design

Conflicts:
	geonode/templates/base.html
simplify CSW tests execution
Update zh translation from transifex
Send logs from upload and slurp to os.devnull

By default instead of sending them to stdout.
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Merge pull request #412 from tomkralidis/dev

simplify CSW tests execution
removed categories from search form
edited avatar styles
replaced placeholder images with divs
Merge branch 'dev' of github.com:GeoNode/geonode into wmc
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'design' of github.com:eldarion/geonode into design
Added missing space for git-dch
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Merge branch 'dev' of github.com:GeoNode/geonode into wmc