Test
Merge branch 'sergio' of https://github.com/netox/ContaPagos into sergio

Conflicts:
	index.php