Lalala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/app/cci/com/bliblistream/outil/ToolKit.java