Updated entity to 1.1 in makefile
Merge branch 'release' into development