added trading country and point of view to uploads
separate templates for importer and exporter uploads
implemented designation geo entities and added an import script for CITES parties
added trading country dropdown
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