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

Conflicts:
	js/model/Ticket.js
fffff