version bump
Merge branch 'master' of github.com:empowerunited/manage

Conflicts:
	lib/manage/version.rb