Correcao
Merge master into gh-pages

Conflicts:
	js/application.js