Changed the index html
moved some data parsing from comlib to twi and cs4
Made branch global
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
branch now global
moved data parsing form comlib to twi and cs4