make it working with django 1.6
initial work towards django 1.6
Some resource_base_snippet style
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# By Simone Dalmasso
# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
  revert the search limit and offset in search pages. we need that
  return full categories and owner in apis
  don't add the limit and offset in url unless they are specified by the user
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# By Ariel Nunez (3) and others
# Via Simone Dalmasso (1) and Tyler Garner (1)
* 'master' of https://github.com/GeoNode/geonode:
  Remove apt-get step from the OSX instructions.
  Allow users create GeoGit repositories with underscores in the name.
  distinct on resources and try again to put the api in installed apps so the tests are ran
  Commented out dynamic by default
  Added accessor fields to layer
  Added geonode.contrib.dynamic
  add featured field in resource base, add featured api, add featured logic to the homepage
Merge branch 'master' of https://github.com/GeoNode/geonode into django1.6

Conflicts:
	geonode/contrib/services/urls.py
	geonode/documents/urls.py
	geonode/documents/views.py
	geonode/layers/urls.py
	geonode/layers/utils.py
	geonode/layers/views.py
	geonode/maps/models.py
	geonode/maps/urls.py
	geonode/maps/views.py
	geonode/people/urls.py
	geonode/proxy/views.py
	geonode/views.py
	setup.py
fix url imports and hashlib for django 1.6
Some layout fixes
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# By Ariel Núñez
# Via Ariel Núñez
* 'master' of https://github.com/GeoNode/geonode:
  Update pavement.py
  Update README
  Update README
add default value to map layer transparent
Add fake links to items list actions
fixed proxy tests, thanks @ingenieroariel
add api url
add api url
save the layers even if the was is not available, by @ingenieroariel
Fix some layer detail style
ad a wcs links test to integration
update setup.py to geonode django1.6 forks
put a help text for the featured field
Merge branch 'master' of https://github.com/GeoNode/geonode