add air object measure icon
Merge remote-tracking branch 'origin2/master'

Conflicts:
	res/layout/fragment_measure_air.xml