v0.7.1
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/wap/history1.0.js
	js/wap/wechat1.0.js
	js/wap/wechat1.1.js
	js/wap/wechat1.1.min.js
	protected/modules/wap/views/wap/index.php
add img pics
gitignore changed