* show dev version docs
* show dev version docs
* TODO
Merge branch 'master' into dev

Conflicts:
	README.md