Merge branch 'master' of heroku.com:webreg-pro
add classes backend
fixed conflicts