Added client side check to selecting student and template
Fix merge conflict.