test
Merge branch 'master' of https://github.com/diegoguidotti/dbmng

Conflicts:
	tests/ajax.php