base config AA
OK for dev and will test on prod
Merge pull request #61 from Matthieuuuu/action-mailer-indus

OK for dev and will test on prod
Active admin #done
fixing conflicts
Merge pull request #62 from Matthieuuuu/activeadmin

Activeadmin
fix conflit in dbshema
tring to fix gemfile lock