tg
Merge remote-tracking branch 'remotes/origin/master' into version2BR

Conflicts:
	version1.0.js
Merge branch 'version2BR' of https://github.com/PiniR/version1.0 into version2BR