change timeout to 50 seconds
Merge branch 'master' of https://github.com/dengshuan/avos-hackathon