Merge branch 'master' of https://github.com/guozhgang/iframe

Conflicts:
	WebContent/logs/log.log
Merge branch 'master' of https://github.com/guozhgang/iframe