Comit de l'acitivité tranquil

Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/ter

Conflicts:
	res/values/strings.xml
Résolution de bugs

Signed-off-by: Lois47 <collet.lois@gmail.com>
Ajout de plusieurs trucs sur le mode tranquille

Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/ter

Conflicts:
	AndroidManifest.xml

Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/ter

Conflicts:
	AndroidManifest.xml
	src/m2dl/ter/mobadict/MainActivity.java

Signed-off-by: Lois47 <collet.lois@gmail.com>