tmp
local
poubelle
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa

Conflicts:
	mepa-front/src/main/java/fr/epita/sigl/mepa/front/controller/pool/PoolController.java
	mepa-front/src/main/resources/tiles.xml
	mepa-front/src/main/webapp/WEB-INF/views/pool/poolManager.jsp