Delete xinha5.3.diff

No longer needed as a diff now it's not a remote repo
Admin -> Bootstrap: Fix style conflict with glyph icons
Admin -> Bootstrap: Update admin page link to go to GitHub issues tracker instead of the (dead) Jojo bugtracker
Updated CSSTidy
Merge branch 'master' into edge