Switched error message to loading message
Merge remote-tracking branch 'upstream/master' into fixLoadingMessage
Display 'Loading...' each time we load a file
Merge pull request #199 from beaufortfrancois/fixLoadingMessage

Switched error message to loading message