fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	yii-imagine/ImagineYii.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix character date save
fix pagebase characters null