Fixed tabbing issue
Merge branch 'master' into beta

Conflicts:
	spec/TestSpec.js
	specs.sh
Fixed syntax issue, updated expected counts