User fixes #43
Merge branch 'rails4' of github.com:cirope/mawidabp into rails4