test
test scherlock
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fr/nf28/main/MainActivity.java