Merge branch 'develop' into adding_individual_shipments
fixed shipments table edit-delete functionality
Merge branch 'adding_individual_shipments' of github.com:unepwcmc/SAPI into adding_individual_shipments
setup edit-delete for individual shipments
Merge branch 'develop' into adding_individual_shipments

Conflicts:
	app/assets/javascripts/trade/helpers/shipments_table.js.coffee
removed unused properties on shipments ember controller
removed max-height from shipments modal
Merge pull request #118 from unepwcmc/adding_individual_shipments

Adding individual shipments