more changes
Merge branch 'master' of github.com:sofibraun/oxempresarial

Conflicts:
	source/img/.DS_Store
	source/localizable/miniLessons.html.slim
	source/vendor/assets/.DS_Store