server settings;
Merge branch 'master' of https://github.com/xiaohe10/newExpertRecommendation
apache django configuration