Deformations of Q-Calabi-Yau 3-Folds and Q-Fano 3-Folds of Fano Index 1