pass over 3.1
Merge branch 'master' of https://github.com/ruonanli/socialvision2014