Added main.h file that the core template uses for the main function
Fixed merge conflict
Merge branch 'core-warning-fix' into integration