** Added deus-nex-machina folder to .gitignore
** Made material loading sequential, not parallel
Merge branch 'FTR-44_material-editor' of https://github.com/otavanopisto/muikku.git into FTR-44_material-editor