Finalização do Protótipo
Merge remote-tracking branch 'Git/master'

Conflicts:
	views/layouts/main.php
	views/site/index.php