Updated doc rule in makefile
merged dev
generated documentation