Updated master, making sure it works after switching back from outdated redo branch
Moved All Resource images