fix rebasing problems
merge app.rb
fix add/edit func with relations
fix fill selects function
merge with backend
fix users.rb