Updating transaction management to Django 1.6, using @transaction.atomic instead of @transaction.comit_on_success
merging mpa.models from campaign branch, fixing transaction management