update
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/gii/crud/templates/compact/form.php