Change version number for release.
Merge branch 'master' of https://github.com/enthought/encore

Conflicts:
	encore/__init__.py