Squashed commit of the following:

commit 66ea562dd3bf5f69a128b518317cfe862a2f2399
Author: shixiaoyu <shixiaoyu.zju@gmail.com>
Date:   Sat Aug 23 13:02:46 2014 -0700

    Added the new student geo info to faq.html.
Merge branch 'master' of https://github.com/baozitraining/BaoziWebsite