Resolved merge conflict
Merge branch 'master' into development
Updated make file to point to development branch
Resovled merge conflict in makefile