Create master.txt
commit pom
Merge branch 'develop'

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.pro/timser/pom.properties
time
time
time
time
time