Potential conflict
Merge branch 'master' of github.com:soundarapandian/faunalia

Conflicts:
	translated/fr/training.po
Merge branch 'master' of github.com:soundarapandian/faunalia
Merge branch 'master' of github.com:soundarapandian/faunalia
Translation