Admin: LocationConnectionController
Merge remote-tracking branch 'origin/master'

Conflicts:
	Kode/HiNSimulator2014/HiNSimulator2014/HiNSimulator2014.csproj