fix issue related to reloading
Merge pull request #1 from iffyuva/reloading-stuff

fix issue related to reloading
Set auto load path to /app
Merge remote-tracking branch 'github/master' into github-issue-14382
Catch up with latest on remote
Merge remote changes