Merge branch 'nbites'

Conflicts:
	src/man/memory/MVision.cpp
	src/man/memory/protos/Vision.proto
	src/qtool/viewer/VisionViewer.cpp
	src/qtool/viewer/VisionViewer.h
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'

Conflicts:
	src/qtool/viewer/VisionViewer.cpp
	src/qtool/viewer/VisionViewer.h
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'
Merge branch 'overhaul_tool' of https://github.com/emamanto/nbites into overhaul_tool
Merge branch 'overhaul_tool' of https://github.com/emamanto/nbites into overhaul_tool
Offline vision module added sort of hackishly. Default message pool size increased to 30
offline vision now usable for vision debugging. could be better
merge conflicts
Merge branch 'nbites'
Merge branch 'overhaul'
still have rough cmakelists issues
Compiles
fixed multiple inheritance