Fixed some coding style
Changed makefile to use development branch
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release