test
setup tests
test content view
test content view
test content view
test init content view ready
content view
solved merge diffs
view content test
Attempt to make the standard views render the qunit (JavaScript) unit tests if required
Updated the test environment
Merge remote branch 'origin/tests' into laura_client2_tests

Conflicts:
	public/index.php
content view test
Merge remote branch 'origin/laura_client2_tests' into tests
Eased the pain of setting up the test environment