Merge Admin
Merge branch 'dev' of https://github.com/Metali/lpdw2.0 into dev

Conflicts:
	app/controllers/admin_controller.rb
Correction some route