poprawki view
Merge branch 'master' of github.com:apodlaski/common_rails

Conflicts:

lib/generators/common_rails/app/files/app/controllers/common/invitations
_controller.rb