Add ALLOWED_HOSTS setting. Remove debug logging setting.
Bump Django requirement to 1.5.1.
Remove viewshare.apps.vendor.announcements and add dependency to pinax django-announcements app.
Change django-announcements requirement to pull from pypi.
Remove 'params' variable from TemplateView templates. The variable is no longer used in Django 1.5.
simplejson is no longer used in Django 1.5. I don't think we need the dependency in viewshare either.
Modify dialogs.html template to use quoted 'url' templatetag.
Update moderated_registration to work with Django 1.5 and our current version of django-registration which is 0.8.
fix conflict between bootstrap and jquery UI for profile edit dialog
Fullscreen overlays for view and facet editors, along with various bootstrap bug fixes
Merge branch 'feature/fullscreen_editors' into develop
Display a TimelineAugmentView inside a modal. Augment date-based properties.
Validate that new CompositePropertyModel objects created during augmentation don't have the same name as an existing property.
Create PatternPropertyModel and ListAugmentView for splitting data that follows an identifiable patter (such as CSV). This implementation is not complete as the way we store Exhibits is about to change.
Merge branch 'feature/cherrypick_augmentation' into develop

Cherry-picking dataset editor improvements for augmentation that were missed in the merge, but ended up in feature/new_datamodel
Remove 'use_decimal' argument from json.dumps calls.
Upgrade django-registration from 0.8 to 1.0.
Merge pull request #22 from wamberg/feature/django-1.5

Feature/django 1.5
Removing JSONDataModel, as it really only represents one field
Pinning south version number in the event of 2.0 release