Added rule to ignore *~ files
Merge branch 'master' into development
Merge branch 'development' of https://github.com/nikolausmayer/web3dviewer into development