Category.java
Merge branch 'master' of https://github.com/komelio/ticket_all

Conflicts:
	ticket-ski/trunk/WebContent/base/SubjectDialog.jsp