Merge branch 'master' of https://github.com/bherila/n2cms
Clean up Empty.aspx and Default.aspx
Merge branch 'master' of https://github.com/n2cms/n2cms
Merge commit '70f21c488f5692290216c1212e02903bd3c0460c'
Whitespace only -- to reduce future merge conflicts