Merge remote-tracking branch 'origin/master'
User Template + Grop View Added