fixed test project not depending on engine
removed unnecessary stuff from getCurrentLocation() on windows
Merge remote-tracking branch 'origin/develop' into develop