sync osgeolive script to osgeo svn
add missing migration for categories
Merge branch 'master' of https://github.com/GeoNode/geonode
Minor CSS fixes
Merge branch 'master' of https://github.com/GeoNode/geonode into css-fixing

# By Ariel Nunez (2) and Simone Dalmasso (1)
# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
  add missing migration for categories
  Updated changelog
  Added utf8 encoding to local_settings, refs #974
Bump pinax-theme-bootstrap to 3.0all
Upgraded dependencies for django third party apps
Changed name of distribution to python-geonode
Updated changelog
Updated changelog
Fixed name in setup.py that should not have been changed
Changelog update
Reverted changes to geonode python package output format
add map view button in list item
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of https://github.com/GeoNode/geonode into css-fixing

# By Ariel Nunez (1) and others
# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
  add map view button in list item
  Upgraded dependencies for django third party apps
  Bump pinax-theme-bootstrap to 3.0all
hide pagination numbers
Added some CSS to Layer Style Manage
Merge branch 'master' of https://github.com/GeoNode/geonode into css-fixing

# By Simone Dalmasso
# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
  hide pagination numbers

Conflicts:
	geonode/static/geonode/css/base.css
No minify option in less