Merge branch 'develop'
Merge branch 'develop'
driver paper
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/declarations_controller.rb
fix bug -- driver paper
fixbug--print_packing3
fixbug--print_cargos
fixbug--print_cargos
fixbug--print_