Don't panic... Varela
Merge origin/master

Conflicts:
	FlexDesktop/public_html/js/Cuentas.js