Merge branch 'master' of github.com:Develman/tiejs

Conflicts:
	dist/tiejs.min.js