Merge branch 'master' into production
fixed typo.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
add whitelist branch.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
Merge branch 'production' of https://github.com/PHPConf-TW/website-2014 into production
Merge branch 'master' into production
Fixed typo
Merge branch 'production' of https://github.com/PHPConf-TW/website-2014 into production