Added login redirects to user pages.
Added more user based redirects to addarticle.jsp createcategory.jsp and
deletcategory.jsp
Merge branch 'master' of https://github.com/hitek/Group2.git

Conflicts:
	WebContent/AdminUserList.jsp
	WebContent/EditUser.jsp
Trying to fix conflicts....
Merge branch 'master' of https://github.com/hitek/Group2.git