Updated version number
Merge branch 'master' into devel

Conflicts:
	lib/percolate/version.rb