Updated makefile to switch between debug and release mode
Merge branch 'master' into linuxX11