updating
translate functionality half working
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	modules/headerin.php
	modules/index.php