improved badge popover templates to handle lack of data better
fixed badge data loading logic
Merge branch 'master' of github.com:surevine/neon