Added more structure regarding js objects.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/index.html