Merge branch 'dev' into feature_fileDisplay
Merge branch 'feature_fileDisplay' of https://github.com/t-animal/DocMatic.git into feature_fileDisplay
Merge branch 'feature_fileDisplay' of https://github.com/t-animal/DocMatic.git into feature_fileDisplay
:Merge branch 'feature_fileDisplay' of https://github.com/t-animal/DocMatic into feature_fileDisplay

n updated upstream into a topic branch.