Update badges to point to 18f/dev
Merge branch 'feature/update_badges_for_18f' into dev