1.update at admin side 
2. implemented validation on welcome->admin->addSubject
Merge origin/master