add ImageTalk two new filed
Merge branch 'master' of https://github.com/popsup/popsup

Conflicts:
	protected/models/Tip.php
	protected/models/TipLog.php