Update version.rb
Merge branch 'dev' into disqus

Conflicts:
	lib/storytime/version.rb