display badges on the same line
Merge pull request #159 from acmetech/master

display badges on the same line
Merge pull request #158 from MartinGoulet/master

Change find by find_by_id in application_controller