Merge conflict project files
Merge branch 'dev' of https://github.com/Ucantseeme/eCCore into dev