Merge branch 'master' of git://github.com/WoltNet/WoltNet-Wiki
Merge branch 'master' of git://github.com/WoltNet/WoltNet-Wiki
Merge branch 'master' of git://github.com/WoltNet/WoltNet-Wiki
Merge branch 'master' of git://github.com/WoltNet/WoltNet-Wiki
Template fix
Update
Merge pull request #30 from illyaine/master

Template fix