Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	information-brow.html
	js/cmpInforShow.js

luyanan %!s(int64=7) %!d(string=hace) años

padre

d8012c3fbe e56e7b1336

commit

16ee8a48af