Badges on master branch
Merge branch 'dev'

Conflicts:
	README.md
Both master and dev status in same readme
labeling stuff