Changed test suite to Jasmine
Merge remote-tracking branch 'origin/master' into Stashy.Menu

Conflicts:
	tests/tests.html
Added menu spec