separate js files
Merge branch 'master' of github.com:eduardolujan/Vildosola

Conflicts:
	vildosola/vildosola/static/js/shipment/functions.js