Merge pull request #9 from pdiot/master

Prépa métadonnées
Merge branch 'master' of github.com:flv/Synchrotags
Merge branch 'master' of github.com:pdiot/Synchrotags
Merge branch 'master' of github.com:acarchan/Synchrotags
big merge
Merge branch 'master' of github.com:pdiot/Synchrotags
Ajout d'un écran Settings
Commit du lundi, hihihi.
Merge branch 'master' of github.com:flv/Synchrotags

Conflicts:
	AndroidManifest.xml
	src/fr/voltanite/activity/MainActivity.java
	src/fr/voltanite/activity/ParentSearch.java
test data json
Merge branch 'master' of github.com:acarchan/Synchrotags

Conflicts:
	src/fr/voltanite/activity/MainActivity.java
Merge branch 'master' of github.com:pdiot/Synchrotags

Conflicts:
	src/fr/voltanite/activity/ParentSearch.java
Utilisation de xzing pour scanner des trucs