GitLab

Conflicts:
	snf-astakos-app/Changelog
	snf-astakos-app/README
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/functions.py
	snf-astakos-app/astakos/im/settings.py
	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
	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/templates/im/base.html
	snf-astakos-app/astakos/im/views.py
	snf-astakos-app/conf/20-snf-astakos-app-settings.conf

or does not participate in any group

Conflicts:
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/views.py

Conflicts:
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/views.py

- Extra select for sorting table

Conflicts:
	snf-astakos-app/astakos/im/templates/im/billing.html
	snf-astakos-app/astakos/im/templatetags/filters.py
	snf-astakos-app/astakos/im/views.py