Commit #6 - Augusto -
Merge commit 'af324f3ddfa55b6e3e2dffb1fb1c7e0d07230702'

Conflicts:
	index.php