sub
Merge branch 'master' of https://github.com/pascal-klaeres/wp-admin-interface

Conflicts:
admin-interface.php