Unified description for hopping transport in organic semiconductors including both energetic disorder and polaronic contributions