Added uuid project to main makefile
Merge branch 'development' of github.com:ding2tal/ding2 into development