Added *.swp to .gitignore
Merge branch 'master' into develop/scene