changed project structure, added CAAT libry and rendered players using CAAT
Merge branch 'master' of https://github.com/Sangraama/client_phase_I

Conflicts:
	index.html
	js/lib/bootstrap.js
	js/lib/bootstrap.min.js
	js/lib/jquery-1.9.1.js
	js/lib/jquery-1.9.1.min.js
	js/lib/jquery.json-2.4.min.js
	js/lib/jquery.websocket-0.0.4.js
Delete connection
Delete connection
Update git ignoew
Add subprotocol
fixed merge conflicts
Remove intel project
Add files
Merge branch 'master' into staticWebClient
Merge branch 'staticWebClient' of https://github.com/Sangraama/client_phase_I into staticWebClient