Merge branch 'development' into release
Fixed make file
Merge branch 'release' into development
Change make file to use development branches