Fix #15 Bug when edit subject or category
Merge origin/UserRegistration into UserRegistration