dev modele
webservices
Merge branch 'master' of https://github.com/kefran/georace

Conflicts:
	GeoRaceApp/app/src/main/java/com/utbm/georace/activity/MainActivity.java
	GeoRaceApp/app/src/main/res/layout/activity_main.xml
WebService
Correction et changement de structure de donnée
Merge branch 'master' of https://github.com/kefran/georace

Conflicts:
	GeoRaceApp/app/app.iml
	GeoRaceApp/app/build.gradle
	GeoRaceApp/app/src/main/java/com/utbm/georace/activity/MainActivity.java
correction webservice
Merge branch 'master' of https://github.com/kefran/georace

Conflicts:
	GeoRaceApp/.idea/misc.xml
	GeoRaceApp/app/app.iml
	GeoRaceApp/app/build.gradle

GeoRaceApp/app/src/main/java/com/utbm/georace/activity/LoginActivity.jav
a

GeoRaceApp/app/src/main/java/com/utbm/georace/activity/MainActivity.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Checkpoint.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Photo.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Race.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Team.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Track.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/User.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/Config.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/ISerializable.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/WebService.java
	GeoRaceApp/gradle/wrapper/gradle-wrapper.properties
	webService/admin/conf.php
	webService/get_checkpoint.php
	webService/get_data.php
	webService/get_participation.php
	webService/get_race.php
	webService/get_track.php
	webService/get_track_checkpoint.php
	webService/get_user.php
Merge branch 'master' of https://github.com/kefran/georace

Conflicts:
	GeoRaceApp/.idea/misc.xml
	GeoRaceApp/app/app.iml
	GeoRaceApp/app/build.gradle

GeoRaceApp/app/src/main/java/com/utbm/georace/activity/LoginActivity.jav
a

GeoRaceApp/app/src/main/java/com/utbm/georace/activity/MainActivity.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Checkpoint.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Photo.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Race.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Team.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/Track.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/model/User.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/Config.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/ISerializable.java
	GeoRaceApp/app/src/main/java/com/utbm/georace/tools/WebService.java
	GeoRaceApp/gradle/wrapper/gradle-wrapper.properties
	webService/admin/conf.php
	webService/get_checkpoint.php
	webService/get_data.php
	webService/get_participation.php
	webService/get_race.php
	webService/get_track.php
	webService/get_track_checkpoint.php
	webService/get_user.php