Refactor error pages.
Merge branch 'master' into vulninjections
Merge branch 'master' into vulninjections
Start vulnerability config.
Merge branch 'master' into vulninjections
Config loads successfully
Config loads successfully. Fully finished.
XSS output.
Stored XSS.
Stored XSS.
Fix doc
SQL Injection + Blind
Merge branch 'master' into vulninjections
Fix Wishlist issues
Add referer partially
Merge branch 'master' into vulninjections

Conflicts:
	classes/App/Page.php
	classes/App/Pixie.php
Merge branch 'master' into vulninjections
Merge branch 'master' into vulninjections
Merge branch 'master' into vulninjections
Update from SVN