Merge branch 'aquarium', remote-tracking branch 'origin'

Conflicts:
	snf-astakos-app/astakos/im/settings.py

diff --cc snf-astakos-app/astakos/im/settings.py
index e1425e6,b3d1abd..d6b4020
--- 1/snf-astakos-app/astakos/im/settings.py
--- 2/snf-astakos-app/astakos/im/settings.py
+++ b/snf-astakos-app/astakos/im/settings.py
@@@ -58,6 -58,13 +58,13 @@@ RECAPTCHA_PUBLIC_KEY = getattr(settings
  RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
  RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS', {'theme': 'white'})
  RECAPTCHA_USE_SSL = getattr(settings, 'ASTAKOS_RECAPTCHA_USE_SSL', True)
+ RECAPTCHA_ENABLED = getattr(settings, 'ASTAKOS_RECAPTCHA_ENABLED', True)
+ 
+ # set AstakosUser fields to propagate in the billing system
+ BILLING_FIELDS = getattr(settings, 'ASTAKOS_BILLING_FIELDS', ['is_active'])
+ 
+ # Queue for billing.
 -QUEUE_CONNECTION = getattr(settings, 'ASTAKOS_QUEUE_CONNECTION', None) # Example: 'rabbitmq://guest:guest@localhost:5672/astakos.*'
++QUEUE_CONNECTION = getattr(settings, 'ASTAKOS_QUEUE_CONNECTION', None) # Example: 'rabbitmq://guest:guest@localhost:5672/astakos'
  
  # Set where the user should be redirected after logout
  LOGOUT_NEXT = getattr(settings, 'ASTAKOS_LOGOUT_NEXT', '')