Initial work on progress in upload
More work to make upload progress work with rest based uploads
Merge branch 'master' of github.com:GeoNode/geonode into upload_progress

Conflicts:
	geonode/static/bower.json
	geonode/templates/base.html
Merge branch 'master' of github.com:GeoNode/geonode into upload_progress
Update javascript dependencies
Rework progress function
Adding ajax queue
Adding ajax queue to base template in debug
Use ajaxQueue in layer upload
Fix polling setup
Merge branch 'master' of https://github.com/GeoNode/geonode into upload_progress
Updated changelog
added Michael Diener to authors
Updated acls and resolve_user functions to use the user's profile setting.
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of github.com:GeoNode/geonode
Updated changelog
Updated geoserver url in local_settings
Create /updatelayers hook, reformat output of gs_slurp to avoid code duplication
Merge branch 'master' of https://github.com/GeoNode/geonode into upload_progress

Conflicts:
	geonode/settings.py