viihaptics integration
Merge branch 'master' of https://github.com/CHI2013/glance

Conflicts:
	html/mosaic/js/tiles/session.js