corrections mineures
Merge branch 'master' of https://github.com/Zaurak/NEAT

Conflicts:
	editeur/src/com/example/neat/EditActivity.java
	editeur/src/com/example/neat/EditorActivity.java