astakos: remove obsolete code
Merge remote-tracking branch 'origin/0.12' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/activation_backends.py snf-astakos-app/astakos/im/api/admin.py snf-astakos-app/astakos/im/auth_backends.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Merged demo
Fix code formatting to conform to the PEP 8 style guide
Change clientid in aquarium messages to string
Add billing tab
Progress VIII
move aquarium listener in endpoints
View revisions
Also available in: Atom