Updated items

now everything seems in.

Signed-off-by: Bytesplit <bytesplit@googlemail.com>
Merge remote-tracking branch 'upstream/master'

Signed-off-by: Bytesplit <bytesplit@googlemail.com>

Conflicts:
	base.html
	visu.css
Merge branch 'master' of github.com:bytesplit/quad

Signed-off-by: Bytesplit <bytesplit@googlemail.com>

Conflicts:
	base.html
	visu.css