Merge branch 'unstable'

Conflicts:
	modules/Copyright.js
	strapTK.min.js
Merge branch 'unstable'

Conflicts:
	strapTK.min.js