fix issue
Merge branch 'master' of https://github.com/ireal-ki/1081009wp

Conflicts:
	libs/main.js
new copy