Merge branch 'master' of https://github.com/rOpenSci/comtradr

# Conflicts:
#	DESCRIPTION