Merge branch 'master' of https://github.com/koebes/wingwillwin.tk

Conflicts:
admin/index.php