Finding location by external id instead of code
Merge branch 'master' into ilsgateway-locations-fix

Conflicts:
	custom/ilsgateway/commtrack.py
Merge pull request #4748 from lwyszomi/ilsgateway-locations-fix

Ilsgateway locations fix