add ie edge support
Merge branch 'master' of https://github.com/caoguangyao/dong-qian-lake

Conflicts:
	dong_qian_lake/dong_qian_lake/settings.pyc