fix BASE_DIR level
Merge branch 'master' into django1.7