20140611添加内容：当Apache版本不同时所做配置的异同
Merge branch 'dev' into gh-pages