sd
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	js/model/Ticket.js
d
Merge branch 'master' of https://github.com/GrEx0/QuQu7js