Conflicts:
	runtests.sh
	snf-cyclades-app/synnefo/aai/__init__.py
	snf-cyclades-app/synnefo/aai/fixtures/auth_test_data.json
	snf-cyclades-app/synnefo/aai/middleware.py
	snf-cyclades-app/synnefo/aai/models.py
	snf-cyclades-app/synnefo/aai/shibboleth.py
	snf-cyclades-app/synnefo/aai/tests.py
	snf-cyclades-app/synnefo/admin/templates/invitations_list.html
	snf-cyclades-app/synnefo/admin/templates/users_info.html
	snf-cyclades-app/synnefo/admin/templates/users_invite.html
	snf-cyclades-app/synnefo/admin/templates/users_list.html
	snf-cyclades-app/synnefo/app_settings/default/aai.py
	snf-cyclades-app/synnefo/app_settings/default/helpdesk.py
	snf-cyclades-app/synnefo/app_settings/default/invitations.py
	snf-cyclades-app/synnefo/db/admin.py
	snf-cyclades-app/synnefo/db/bill_calculator.py
	snf-cyclades-app/synnefo/db/charger.py
	snf-cyclades-app/synnefo/db/credit_allocator.py
	snf-cyclades-app/synnefo/db/fixtures/disks.json
	snf-cyclades-app/synnefo/db/fixtures/images.json
	snf-cyclades-app/synnefo/db/fixtures/users.json
	snf-cyclades-app/synnefo/db/management/__init__.py
	snf-cyclades-app/synnefo/db/management/commands/__init__.py
	snf-cyclades-app/synnefo/db/management/commands/calculate_bills.py
	snf-cyclades-app/synnefo/db/management/commands/charge_users.py
	snf-cyclades-app/synnefo/db/management/commands/credit_alloc.py
	snf-cyclades-app/synnefo/db/management/commands/run_db_control.py
	snf-cyclades-app/synnefo/db/tests.py
	snf-cyclades-app/synnefo/helpdesk/__init__.py
	snf-cyclades-app/synnefo/helpdesk/helpdesk.py
	snf-cyclades-app/synnefo/helpdesk/middleware.py
	snf-cyclades-app/synnefo/helpdesk/models.py
	snf-cyclades-app/synnefo/helpdesk/templates/helpdesk.html
	snf-cyclades-app/synnefo/helpdesk/tests.py
	snf-cyclades-app/synnefo/helpdesk/urls.py
	snf-cyclades-app/synnefo/invitations/__init__.py
	snf-cyclades-app/synnefo/invitations/invitations.py
	snf-cyclades-app/synnefo/invitations/locale/el/LC_MESSAGES/django.mo
	snf-cyclades-app/synnefo/invitations/locale/el/LC_MESSAGES/django.po
	snf-cyclades-app/synnefo/invitations/models.py
	snf-cyclades-app/synnefo/invitations/templates/error.html
	snf-cyclades-app/synnefo/invitations/templates/invitation.txt
	snf-cyclades-app/synnefo/invitations/templates/invitations.html
	snf-cyclades-app/synnefo/invitations/templates/welcome.html
	snf-cyclades-app/synnefo/invitations/tests.py
	snf-cyclades-app/synnefo/invitations/urls.py
	snf-cyclades-app/synnefo/logic/credits.py
	snf-cyclades-app/synnefo/logic/email_send.py
	snf-cyclades-app/synnefo/logic/management/commands/reconcile_old.py
	snf-cyclades-app/synnefo/logic/users.py
	snf-cyclades-app/synnefo/plankton/backend.py