try
Merge branch 'master' of https://github.com/nicolasfavier/GAE-JS-AJAX

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/nicolasfavier/GAE-JS-AJAX
add jquery for add trainning
Merge branch 'master' of https://github.com/nicolasfavier/GAE-JS-AJAX

Conflicts:
	war/WEB-INF/classes/models/Exercice.class
	war/WEB-INF/classes/models/Trainning.class