mudancas fabricio

mud.
Merge branch 'master' of https://github.com/endogenese/SiteEndogenese

Conflicts:
	jquery/jquery.easing.1.3.js
	jquery/waypoints/licenses.txt