Common fixed points for single-valued and multi-valued maps satisfying a generalized contraction in G-metric spaces