Synchro pour backup
Synchro pour backup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
	.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_2.xml
	.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_0_6.xml
	.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_0_6.xml
	.idea/libraries/Maven__com_google_appengine_appengine_api_labs_1_7_2.xml
	.idea/libraries/Maven__com_google_gwt_gwt_user_2_5_0_rc1.xml
	.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
	.idea/libraries/Maven__javax_inject_javax_inject_1.xml
	.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml
	.idea/libraries/Maven__javax_validation_validation_api_sources_1_0_0_GA.xml
	.idea/libraries/Maven__org_apache_tomcat_el_api_6_0_36.xml
	.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_36.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_12.xml
	.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
	.idea/libraries/Maven__org_hibernate_hibernate_validator_4_1_0_Final.xml
	.idea/libraries/Maven__org_joda_joda_money_0_6.xml
	.idea/libraries/Maven__org_json_json_20090211.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_acl_3_1_3_RELEASE.xml
	.idea/libraries/Maven__org_springframework_security_spring_security_crypto_3_1_4_RELEASE.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_config_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_core_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_facebook_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_facebook_web_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_twitter_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_web_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_spring_aop_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_beans_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_core_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_expression_3_2_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_jdbc_3_0_7_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_tx_3_0_7_RELEASE.xml
	desktop-application/desktop-application.iml
	desktop-application/pom.xml
	pom.xml
	utils/utils.iml