Signed-off-by: Levi <levi.lirvat@niji.fr>
Commit

Signed-off-by: Levi <levi.lirvat@niji.fr>
Merge branch 'master' of github.com:kowlown/Planetside2UA

Conflicts:
	PlanetSide2UA/src/fr/mystnihon/planetside/ui/fragment/CharacterDetailFragment.java
Commit

Signed-off-by: Levi <levi.lirvat@niji.fr>