fix @axis null error
fix pdf graph issue
update
fix xml user information disclosure
Merge branch 'master' into demo

Conflicts:
	public/assets/snorby.css.gz
	public/assets/snorby.js.gz