Fixed story X part 1. Victor Henrik
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Fixed merge errors from desynced push of deleted files. Victor Henrik