setting model
paypal setting
frequency model
role correction
transaction_type
Prevent merge conflicts

Merge branch 'master' into models_tests
Merge pull request #103 from cdcueva/models_tests

Models tests