battery monitor, and more ui modifications
more stuff
even more merging.  ugh
Remove more
Merge branch 'master' into aviation

Conflicts:
	.gitignore
	ROS_dotNET.sln
Fix taint