Fixed description of ports in the REST doc template.
Merge branch 'api-v2' of github.com:mesosphere/marathon into api-v2
New container example, more reflective of use-case