Fixing android maven plugin version
Merge remote-tracking branch 'origin/master'

Conflicts:
	SensorLogger/pom.xml