Put obstacle, magictower or physicaltower

(with edge bug)
Merge remote-tracking branch 'origin/master' into develmate