added server side png support
Merge branch 'master' of https://github.com/RangerMauve/drone-test