RicterZ/riXSS — pull request #19 by RicterZ (2014-02-15 08:38:28+00:00)
Title: Merge pull request #16 from RicterZ/master

marge dev and master