If.py modified
Merge branch 'master' of https://github.com/ComboZhc/Clover2013

Conflicts:
	server/ripple/sqlite.db
update