Local changes
Merge branch 'master' of https://github.com/davidonet/ticket-lapanacee

Conflicts:
	routes/ticket.js
Merged modifications