Merge branch 'dev'
install paypal-recurring gem
Merge branch 'dev'
Merge branch 'master' of https://github.com/FirmaExpress/FirmaExpressR into dev
ok, it works, poorly but it does
now yes, working poorly :p
Funciona CTMgit add .git add .
Merge branch 'dev' of https://github.com/FirmaExpress/FirmaExpressR into dev
fix user model conflict