update readme
Merge branch '2014_version'

Conflicts:
	readme.md