Merge branch 'master' into develop
Bumped version number to 0.4-SNAPSHOT
Merge remote-tracking branch 'origin/develop' into release-0.4

Conflicts:
	build.sbt
	project-dev/build.sbt