test
Merge branch 'master' of github.com:jhtiboy/styletest

Conflicts:
	js/weiko/eventUtil.js