add the trainning search by kind
Merge branch 'master' of https://github.com/nicolasfavier/GAE-JS-AJAX

Conflicts:
	src/dao/ExerciceDao.java
	src/dao/TrainningDao.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml