pouf pouf
Merge branch 'master' of github.com:pdiot/Synchrotags

Conflicts:
	res/layout/activity_display_noeuds.xml
	src/fr/voltanite/activity/NodeDisplayActivity.java
Bim badaboum
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