local changes
Merge branch 'mau_devise' of https://github.com/railsbeauty/billi into mau_devise
resolved conflicts