Added waffle.io badge to master
Reformatted README from cherry-pick from develop
Merge branch 'master' into release-v1.2.7

Conflicts:
	README.adoc