New collage and collage items.

This is build occording to new specs. A collage is a collection
of collage items which hold timeserie ids for a specific graph_id.
Merge branch 'master' into sso-auth

Conflicts:
	ddsc_site/urls.py