Merge pull request #121 from acmetech/master

Code consistency/style
make use of the methods provided by the enumerate gem

This will be refactored using Draper
Merge remote-tracking branch 'upstream/master'
add the tooltip_public translation