Merge branch 'release/4.22.1'

.gitignore

@@ -62,6 +62,7 @@ Build/*/**
 
 # Configuration files generated by the Editor
 Saved/*
+!Saved/AutoScreenshot.png
 
 # Compiled source files for the engine to use
 Intermediate/*

CaveOverlay @ 6418ac3a

-Subproject commit 7293e5848a693f20439dc9151f1fefa5459128c3
+Subproject commit 6418ac3acb3b522f6f06fb1b79928f357afdec81

nDisplayExtensions @ 13607574

-Subproject commit 834c741d439ad3ec65018b215de51ca60377fda0
+Subproject commit 13607574073f0bb3cdea6154a2a1924e7e51b543

README.md

@@ -4,7 +4,7 @@ Unreal Engine project template catering to the common use cases at RWTH VR. Cont
 ## Getting Started
 
 ### Add the template
-`git clone -b master-4-22 --recurse-submodules https://devhub.vr.rwth-aachen.de/VR-Group/unrealprojecttemplate.git` to your local `UnrealEngine/Templates` directory. If you are using Unreal version 4.21 you need to change the `master-4-22` to `master-4-21`. If you know what you are doing and want the latest features use the `develop-*` branch instead of the `master-*` branches.
+`git clone -b master --recurse-submodules https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unrealprojecttemplate.git` to your local `UnrealEngine/Templates` directory. If you are using Unreal version 4.21 you need to change the `master` to `deprecated/4-21`. If you know what you are doing and want the latest features use the `develop` branch instead of the `master` branches.
 
 ### Create a new project
 When creating a new Project using Unreal you can find the template under `New Project -> C++ -> RWTH-VR`. After you created the project, open the project folder in the terminal (git-bash on windows) and run the `setup.sh`. This will remove the git remote of the template and optionally lets you add a new remote. This will allow you to call `update.sh` in the future to merge important changes made in the template back into your project. For more details about updating your project can be found in the wiki. 

setup.sh

@@ -51,6 +51,7 @@ then
     git push -u origin develop
     git checkout master
     git push -u origin master
+    git checkout develop
 fi
 
 echo "Done!"
\ No newline at end of file