Internationalization 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/auchievement/base.html
Internationalization 2