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
Merge pull request #21 from plonegovbr/issue_20

Issue 20 closes #20
Merge branch 'master' into issue_7

Conflicts:
	CHANGES.rst
	src/brasil/gov/tiles/static/tiles.js
	src/brasil/gov/tiles/tiles/templates/mediacarousel.pt
Merge branch 'issue_7' into homologacao

Conflicts:
	CHANGES.rst