Creating Pool with name
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch

Conflicts:
	mepa-front/src/main/resources/tiles.xml
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch
Add Pool message confirmation
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch
Update from Master
merge
Beginning to add teams
Merge branch 'jaune_branch' of https://github.com/sigl-mepa-2015/mepa into jaune_branch

Conflicts:
	mepa-front/src/main/webapp/WEB-INF/views/pool/create.jsp
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch

Conflicts:
	mepa-core/src/main/java/fr/epita/sigl/mepa/core/dao/PoolDao.java
	mepa-core/src/main/java/fr/epita/sigl/mepa/core/dao/impl/PoolDaoImpl.java
	mepa-core/src/main/java/fr/epita/sigl/mepa/core/domain/Pool.java
	mepa-core/src/main/java/fr/epita/sigl/mepa/core/service/PoolService.java
	mepa-core/src/main/java/fr/epita/sigl/mepa/core/service/impl/PoolServiceImpl.java
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch
Correct master
Enhancement: update tournament
Merge remote-tracking branch 'origin/master'
Fixed required maxTeamNumber
Fixed to be compatible with Tomcat6
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa
Rectification bad file
Add Tournament annotations
Fix updating
Clean tournaments