updated test folder structure
updated grunt file to reflect this
Merge remote-tracking branch 'origin/master'

Conflicts:
	yadda-tests/features/origin-spec.feature