1.0.5
Finish 1.0.4
sdfsdf
next develop version
asdfasdf
sdfgsdfgsd
Merge branch 'release-1.0.5'
dfgh
asdfasdf
Merge branch 'develop'

Conflicts:
	free_proj/pom.xml
	pom.xml