Merge branch 'develop'
Merge branch 'develop'
version updated to 1.0.5-SNAPSHOT
Merge branch 'develop'
version down to 1.0.4-SNAPSHOT
updated
Merge branch 'master' into develop
udpated
updated