Committing travis configuration
Commit before merging with Yann
Commit before merge
Merge branch 'master' of https://github.com/lbroudoux/24hducode-2014

Conflicts:
	server/src/main/java/org/les24hducode/supercal/fmw/repository/StopRepository.java