enviando modulo logistica
Merge branch 'master' of github.com:lucheol/UninCor_6p

Conflicts:
	UnScientific/UnScientific/__init__.pyc
	UnScientific/UnScientific/settings.pyc