Battery Monitor + Fixed NaoEventFactoryTest
Merge branch 'master' of https://github.com/boschbc/NaoRobot

Conflicts:
	Naovigate.Test/obj/Release/Naovigate.Test.dll
	Naovigate.Test/obj/Release/Naovigate.Test.pdb
	Naovigate.Test/obj/Release/ResolveAssemblyReference.cache
Merge branch 'master' of https://github.com/boschbc/NaoRobot