commit
commit
Merge branch 'master' of https://github.com/fderbel/Trace-Me

Conflicts:
	src/common/locales/fr.json~