Tests
Merge branch 'v1' into v2
Merge branch 'v2' into v3

Conflicts:
	app/tests/WebTestCase.php
	app/tests/functional/SiteTest.php
Merge fix
Merge branch 'v3'
Make v3 test really fail
Merge branch 'v3'
Make tests succeed
Test update
Merge branch 'v3'