Merge with upstream: minor layout and PHPdoc changes
Some work on AnswerDomainChoice, minor phpdoc edit, object graph in documentation