Merge pull request #35 from bspaans/master

Marathon 0.7.0 - RC1
BS: Added HAProxy configuration template