yes
Merge branch 'master' of https://github.com/R4stl1n/allianceauth

Conflicts:
	alliance_auth/settings.py.example
	templates/registered/services.html