Refonte bdd + Class log et activity search
Merge branch 'master' of github.com:Adrien10/MonTpPorte into Adrien

Conflicts:
	res/values/strings.xml
conflit string