adding collage selection
Merge branch 'master' of https://github.com/ddsc/webclient

Conflicts:
	app/index.html
Made collages load
moved favorite parts of code of graphscreen to seperate file
Merge branch 'master' of https://github.com/ddsc/webclient

Conflicts:
	app/index.html