Ajout d'un sous-dépôt
Ajout d'icône

Signed-off-by: unknown <Levi@Negima.(none)>
Modified

Signed-off-by: unknown <Levi@Negima.(none)>
Merge branch 'master' of github.com:kowlown/Planetside2UA

Conflicts:
	PlanetSide2UA/project.properties
	PlanetSide2UA/res/layout/fragment_world.xml
	PlanetSide2UA/src/fr/mystnihon/planetside/ui/fragment/WorldFragment.java