Some small cleanup and bugfixes

Conflicts:

	gamemodel/actions/ARecruit.h
	gamemodel/entities/ELocation.cpp