Weekly phpMyAdmin contributions 2017-W48

Last week I merged the Display templates to reduce the number of includes and also to make it easier to read the code. I also changed all calls to Twig classes from PSR-0 to PSR-4.

Issues: