bajstest
Merge branch 'bajs'

Conflicts:
	Resources/henke.js