201410232312
Merge https://github.com/aprohabt/astredor

Conflicts:
	application/controllers/equipement.php
201410260029
	modified:   application/controllers/perso.php
	modified:   astredor.sql