Revert "1.2.6b"

This reverts commit 8a856deea66fad844f3dfd66759be7618bfcd233.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/clickoin.js