reset master to this
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Conflicts:
	libraries/sql_query_form.lib.php
	server_databases.php
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin