Ignore build directory made by pip
Updated GUI to show Feide instead of shibboleth
Removed social integration
Applied UNINETT theme (must be hosted on https://eduroam.no)
Improved reading locations, and skip empty realms
Various GUI fixes
Merge branch 'master' of https://code.grnet.gr/git/djnro

Conflicts:
	djnro/settings.py.dist
	djnro/templates/base.html
	djnro/templates/footer.html
	djnro/templates/registration/select_institution.html
	djnro/templates/status.html
	edumanage/views.py
Merge branch 'upgrade' into uninett

Conflicts:
	djnro/templates/edumanage/contacts.html
	djnro/templates/edumanage/welcome.html
	djnro/templates/front/management_dropdown.html
	edumanage/decorators.py
	edumanage/views.py
Renamed mimetype to content_type
Redirect main page to edumanage
Removed duplicate service definitions
Formatted config file, and removed old entries
Merge commit '6e718a2' into upgrade

Conflicts:
	djnro/settings.py.dist