#ta-8 fixed add form
Merge branch 'master' of https://github.com/KernelCorp/transport

Conflicts:
	app/assets/javascripts/ember/templates/cargos/new.emblem