merge from upstream/develop
add waffle.io badge
Update README.md
Merge pull request #458 from Xeldal/patch-1

Update README.md
Merge pull request #434 from waffle-iron/master

waffle.io Badge
Merge pull request #5 from BitShares/master

Fork to web_play
Merge branch 'develop' into ui
waffle badge for web_play