lt
Merge branch 'master' of https://github.com/eggine/Adolb

Conflicts:
	Source/TestLocator/main.cpp
lt