espace
Merge branch 'master' of github.com:Adrien10/MonTpPorte into Adrien
enable start and top and comment
Merge branch 'master' of github.com:Adrien10/MonTpPorte into Adrien

Conflicts:
	res/values/strings.xml
resolution conflict