fixing labels
Merge branch 'master' into rails