before merge
Merge branch 'dev_pma5' of https://github.com/Anastaszor/phpmyadmin into dev_pma5

Conflicts:
	protected/components/PMA_Util.php
	protected/lib/display_create_database.lib.php
	protected/lib/mysql_charsets.inc.php
	protected/views/server/index.php
Adding others changes
Adding informationschema module