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

Conflicts:
	ticket-spot/trunk/src/main/resources/database_conn.properties
school
school
Merge branch 'master' of https://github.com/komelio/ticket_all