Merge branch 'master' into Nima-Ghods
add avgADC for bum measurements and fix current
Merge remote-tracking branch 'origin/Nima-Ghods'

Conflicts:
	BMU_v7_6/getAllStates.ino