Merge branch 'core-pr-3' into development
Changed makefile to use development branch
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release