Merge branch 'master' of https://github.com/tesenwein/Phing-Webbuild
Merge branch 'dev'