Merge branch 'master' into 0.7.0-preview

Conflicts:
	src/main/scala/mesosphere/marathon/MarathonScheduler.scala

Integration tests are green.