tesst
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fr/umlv/lastproject/smart/MenuActivity.java