Merge pull request #24 from flashii/master

Merging stable part 22 electric boogaloo
Merge pull request #25 from flashii/master

Enabling CORS for *.flashii.net
Merge pull request #26 from flashii/stable

Stable