Merge branch 'nkupdates' into 'master'

Added badges

See merge request !1
1 job for master in 26 seconds