Model dosen't end with model
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18
collectibles res folername is changed