added postfix service dir
fixed merge conflict
bumped release version, better make-release script