ultimos
Merge branch 'master' of https://github.com/karlosgliberal/basoasuite

Conflicts:
	app/iscroll.html
	app/styles/basoaSlide.less
	app/styles/main.less