possible fix
fix
Merge branch 'master' of https://github.com/AleksejKozlov/copytest

Conflicts:
	js/core.js