added honeypot error
Merge branch 'develop' of github.com:all-ride/ride-web-base into develop
moved orm translation to orm module