update display media, fix error foreach in php/util/class-fieldmanager-util-validation.php
fix conflict