add project_home to local_settings context
Merge remote-tracking branch 'upstream/master'