version 0.95
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/auth.js
	www/js/api.js
	www/main.js
	www/perfil.js