travis v12
Merge branch 'testing' of github.com:alu0100207385/SocialManager into testing