Merge branch 'och' into 'master'

Edited subscriptions

See merge request !275
2 jobs for master in 34 minutes and 51 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Test
passed #3137
black

00:04:17

failed #3136
test

00:34:51

 
Name Stage Failure
failed
test Test There is an unknown failure, please try again
Traceback (most recent call last):
File "/builds/ae/Sith/accounting/tests.py", line 231, in test_new_operation_not_authorized
self.assertTrue(response.status_code == 403)
AssertionError: False is not true

----------------------------------------------------------------------
Ran 146 tests in 1380.765s

FAILED (failures=4)
Destroying test database for alias 'default'...