handle for GEOGIT_DATASTORE in feature_edit_check
Skip time step if not selected
Add GEOGIT_DATASTORE and UPLOADER_SHOW_TIME_STEP to local_settings.py sample
Some cleanup
Merge branch 'master' of github.com:GeoNode/geonode into style-work
Added Mac OSX build instructions
Merge pull request #913 from tlpinney/master

Added documentation for Mac OSX build
add update categories command
Reverting stars to orange
Fixing conflict on profile_base
Fixed double quotes in profile list item
Back to no double quotes in _profile_list_item
Adding padding between items
Overall sync
Merge pull request #916 from ppasq/people_list

People list
Fix typo in geonode/layers/views.py (tests pass)
Fixed conflict in context_processor after merging from master
Reduce number of copies of jquery lib we have floating around
Merge branch 'master' of github.com:jj0hns0n/geonode into upload-work

Conflicts:
Merge pull request #915 from simod/master

Add updatecategories command