Merge branch 'master' into develop
Added new flat badges to README
Fixed spelling mistake in README
Fixed link to LICENSE in badge
Merge branch 'master' into develop
Merge branch 'develop'