merged with server master
为用户账户增加乐观保护锁
Merge branch 'master' of https://github.com/cablewang/jugogo.git

Conflicts:
	index.php
	protected/controllers/AudiosynchController.php
	protected/controllers/LocationsynchController.php
	protected/controllers/NotesynchController.php
	protected/controllers/PhotosynchController.php
	protected/controllers/RestController.php
	protected/controllers/UserrestController.php
	protected/controllers/VideosynchController.php
	protected/controllers/WeathersynchController.php
	protected/extensions/Accessory.php