Merge do index
Merge branch 'master' of git@github.com:marcuslacerda/megarural.git

Conflicts:
	src/main/webapp/index.html