ticket
Merge branch 'master' of https://github.com/ITKWeb/menottes

Conflicts:
	public/index.html
	public/javascripts/controllers/LoggedController.js
	public/javascripts/controllers/displayTicketController.js
	public/javascripts/services/network.js
	public/views/logged.html