Merge branch 'master' of https://github.com/pr0z/XML5AL2K13

Conflicts:
CSS/style.css