trans

trans
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/index.php