update
Merge branch 'beta' of https://github.com/safajirafa/salento into beta