tooltip
tooltip
Merge origin/master

Conflicts:
	app/messages/pt_br/help.php