Merge pull request #147 from programcsharp/FixFileHandling

Enhance file handling
Merge pull request #146 from programcsharp/FixXHTMLParse

Add global option to XHTML parse regex to handle complex XHTML
Added SyntaxHighlighter
Fixed regex
Actually fix xhtml parse issue
Merge branch 'master' of https://github.com/madskristensen/MiniBlog into programcsharp
Merge branch 'FixXHTMLParse2' into programcsharp

Conflicts:
	Website/scripts/admin.js