1.2.3
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js
	update/ajax.php
	update/index.php
	update/maket.tm_
	update/user.php
1.3.0