Change-Id: I5605fa0778be54483442ff308d7b5d393c0f4964
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/META-INF/maven/com.baofoo/tray/pom.properties