fix Makefile for more includes
fix build script
Merge branch 'master' of github.com:rplessl/dovecot-pop-uidl-proxy