Pull from server db
Merge branch 'master' of https://github.com/cassininazir/kinect

Conflicts:
	index.html