Merge remote-tracking branch 'origin/master'

Conflicts:
	test/src/main/res/layout/edit_resistance.xml