User crud - mailer - user activation token
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	asset/css/shuttle-theme.css
	controller/BaseController.php
	controller/Dashboard.php
	controller/Tickets.php
	controller/User.php
	core/session.php
	model/BaseModel.php
	view/info/msg.confirmation.request.twig
	view/info/msg.failure.request.twig
	view/info/msg.success.request.twig
	view/layout.html.twig
Ticket management  Update =>Close, Reopen, Create, delete, notification view
conflict fix
Sauvegarde
head conflicts
Merge pull request #11 from Alex237/view_dev

Ticket management  Update =>Close, Reopen, Create, delete, notification ...
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	asset/css/shuttle-theme.css
	doc/schema.sql
	index.php
test
update alanns