Setting version to 1.0.4
Setting version to 1.0.5-SNAPSHOT
Revert "Setting version to 1.0.5-SNAPSHOT"

This reverts commit 35740c85844ba545628f2e01e7c13875ee584ee2.
Fix release settings
Setting version to 1.0.5-SNAPSHOT
Merge branch 'series/1.0.x'

Conflicts:
	version.sbt