Nouvelle application
Nouvelle application
Nouvelle application
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/libraries/Maven__com_beust_jcommander_1_30.xml
	.idea/libraries/Maven__com_google_guava_guava_14_0_rc1.xml
	.idea/libraries/Maven__com_googlecode_objectify_objectify_4_0b1.xml
	.idea/libraries/Maven__commons_codec_commons_codec_1_7.xml
	.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml
	.idea/libraries/Maven__commons_io_commons_io_2_4.xml
	.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
	.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
	.idea/libraries/Maven__joda_time_joda_time_2_1.xml
	.idea/libraries/Maven__joda_time_joda_time_jsptags_1_1_1.xml
	.idea/libraries/Maven__jstl_jstl_1_2.xml
	.idea/libraries/Maven__junit_junit_4_10.xml
	.idea/libraries/Maven__net_sf_jsr107cache_jsr107cache_1_1.xml
	.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_3.xml
	.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_2_3.xml
	.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_2_3.xml
	.idea/libraries/Maven__org_apache_sanselan_sanselan_0_97_incubator.xml
	.idea/libraries/Maven__org_apache_tomcat_jsp_api_6_0_36.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_12.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_12.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_12.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_12.xml
	.idea/libraries/Maven__org_hibernate_hibernate_validator_annotation_processor_4_1_0_Final.xml
	.idea/libraries/Maven__org_javatuples_javatuples_1_2.xml
	.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml
	.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_2.xml
	.idea/libraries/Maven__org_slf4j_slf4j_jdk14_1_7_2.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_config_3_1_3_RELEASE.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_core_3_1_3_RELEASE.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_taglibs_3_1_3_RELEASE.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_web_3_1_3_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_context_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_web_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_1_RELEASE.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
Nouveau client lourd