Retirado modo debug do galleria
Updated history
Merge branch 'master' into issue_6

Conflicts:
	CHANGES.rst
Merge pull request #19 from plonegovbr/issue_6

Issue 6 - closes #6
Minor change just to make travis run again
Merge branch 'master' of github.com:plonegovbr/brasil.gov.tiles
Merge branch 'master' into issue_20

Conflicts:
	CHANGES.rst