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

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

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