Separate jQuery functions from jasmine matchers
Cleanup
Cleanup

Conflicts:
	demo/js/page.js