Problemas con el avtive
Merge branch 'master' of github.com:karlosgliberal/basoasuite

Conflicts:
	app/styles/basoaSlide.less