add token to quotaholder client
also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
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...
fix quotaholder imports
Fixes
Back up file
Merged demo
handle limit conditions in timeline charging
enhance timeline form, traffic charging support
timeline charging hello world
Change rename and change quota limit field to bigint
Register resources in quota holder
Fix code formatting to conform to the PEP 8 style guide
Change clientid in aquarium messages to string
Add billing tab
import commissioning only if QUOTA_HOLDER_URL is set
Progress VIII
move aquarium listener in endpoints