[michael] CSF-Name of Content text box
[michael] Merge from master
[michael] fixed a merge issue
[michael] CSF - Name of Content box error
[michael] fix on a minor issue
[michael] Fixed an issue with IntelliJ running 2 scenarios
[michael] Fixed spacing and polished a few looks
[michael] Changed a step to now use regex
[michael] Changed another step to now use regex
[michael]Merge master
[michael]Merge again