Merge origin/master

Conflicts:
	tunisianwatchphp/connection/connection.php
Merge origin/master