Merge branch 'future' into 0.6.4

Merge branch 'future' into 0.6.4

Conflicts:
	snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
	snf-astakos-app/astakos/im/api/spec.py
	snf-astakos-app/astakos/im/endpoints/quotaholder.py
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/functions.py
	snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py
	snf-astakos-app/astakos/im/management/commands/invitation-details.py
	snf-astakos-app/astakos/im/management/commands/invitation-show.py
	snf-astakos-app/astakos/im/management/commands/user-add.py
	snf-astakos-app/astakos/im/management/commands/user-details.py
	snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py
	snf-astakos-app/astakos/im/models.py
	snf-astakos-app/astakos/im/settings.py
	snf-astakos-app/astakos/im/static/im/css/modules.css
	snf-astakos-app/astakos/im/static/im/js/common.js
	snf-astakos-app/astakos/im/synnefo_settings.py
	snf-astakos-app/astakos/im/target/shibboleth.py
	snf-astakos-app/astakos/im/views.py
	snf-astakos-app/conf/20-snf-astakos-app-settings.conf