arborescence de packages
Merge remote-tracking branch 'origin/master' into aude

Conflicts:
	src/com/mediageoloc/ata/historic/HistoricAdapter.java
	src/com/mediageoloc/ata/historic/HistoricItemActivity.java
	src/com/mediageoloc/ata/historic/HistoricMediaActivity.java
	src/com/mediageoloc/ata/media/TakeMediaActivity.java
	src/com/mediageoloc/ata/media/photo/PhotoCommentPreviewActivity.java
	src/com/mediageoloc/ata/media/photo/PhotoFilterPreviewActivity.java
extraction méthodes utils de photo
Merge remote-tracking branch 'origin/master' into aude
forgotten break added.
externalisation des fonctions statiques de gestion des préférences et du
traitement des photos
externalisation des fonctions statiques de gestion des préférences et du
traitement des photos
List items updated
merge après refacto
List items updated
Merge branch 'master' of git@github.com:moea-chan/ATA_geoloc_media.git

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/action_search.png
	res/drawable-hdpi/drawer_shadow.9.png
	res/drawable-mdpi/action_search.png
	res/drawable-mdpi/drawer_shadow.9.png
	res/drawable-xhdpi/action_search.png
	res/drawable-xhdpi/drawer_shadow.9.png
	res/layout-land/activity_drawer.xml
	res/layout-land/activity_take_media.xml
	res/values/strings.xml
	src/com/mediageoloc/ata/DrawerActivity.java
	src/com/mediageoloc/ata/DrawerContentInterface.java
	src/com/mediageoloc/ata/SoundActivity.java
	src/com/mediageoloc/ata/historic/HistoricMediaActivity.java
	src/com/mediageoloc/ata/media/TakeMediaActivity.java
Drower list items updated
Drower list items updated
Typo fixed
Modif photo
Merge remote-tracking branch 'origin/master' into aude

Conflicts:
	res/values/strings.xml
	src/com/mediageoloc/ata/media/TakeMediaActivity.java
Merge branch 'master' of https://github.com/moea-chan/ATA_geoloc_media
suppression de historic item activity inutilisé
suppression historicItemActivity inutilisé
Merge branch 'master' of git@github.com:moea-chan/ATA_geoloc_media.git