Merge origin/master

Conflicts:
	ivrtts/mod_main/index.php
Merge origin/master

Conflicts:
	ivrtts/mod_main/index.php
Merge origin/master