updated default page as part of default branch

Signed-off-by: Dan Hacker <dan.hacker@twofour.co.uk>
commited during secondFeatureBranch

Signed-off-by: Dan Hacker <dan.hacker@twofour.co.uk>
Merge commit 'e39a677a492c3a58ebec11e95fe565b0c7470caf'
Merge commit '5d8879548b1066878c2364eb07f26ed7bc414276'

Conflicts:
	WebApplication1/Default.aspx
doh