commit
Merge remote-tracking branch 'origin/master'

Conflicts:

	source/StartProject/target/classes/META-INF/maven/com.whisper/StartProject/pom.properties