Clean up Empty.aspx and Default.aspx
Merge commit '70f21c488f5692290216c1212e02903bd3c0460c'
Whitespace only -- to reduce future merge conflicts