tmp
Updated structure for Taxon model.
Merge remote-tracking branch 'or/master'
Merge remote-tracking branch 'or/master'
Map Zoom change.
Satellite option to obs-list-map
collapse
Merge remote-tracking branch 'or/master'

Conflicts:
	obs/templates/obs/obs_list.html
Species_db
Merge remote-tracking branch 'origin/master'
Object_rate model - for like, dislike and comments on objects
Fixup
Generic Foreign key