added trading country and point of view to uploads
Merge branch 'master' into sandbox_validation
Merge branch 'master' into sandbox_validation
added collection view for sandbox shipments
added fixed run order to validation rules
started work on validation errors
Merge branch 'master' into sandbox_validation

Conflicts:
	app/assets/javascripts/trade/templates/annual_report_upload_form.handlebars
	app/models/trade/annual_report_upload.rb
	db/migrate/20130521095013_add_trading_country_code_and_point_of_view_to_annual_report_uploads.rb
	spec/factories/trade.rb
display validation errors for uploaded file
display relevant shipments when error selected
updated specs
inclusion validations should not report on null values
Merge pull request #42 from unepwcmc/sandbox_validation

Sandbox validation