Workspace created.
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Merge branch 'master' of https://github.com/adrienNk/webapp.git

Conflicts:
	Axa/app/app.js
Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).