Merge branch 'tihuan-master'
fix gemfile conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/Mega-Survey