upgrade ruby version
Merge branch 'master' of https://github.com/ADN-Dev/adn_app
update trainer, types dequipe