local
Merge branch 'master' of https://git.oschina.net/komelio/ticket_all

Conflicts:
	ticket-ski/trunk/src/main/java/com/sweii/action/ReportAction.java