Opções
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/app/Controller/AppController.php
	site/app/Controller/UsersController.php