amol schaugn
Merge branch 'master' of https://github.com/andreaspfurtscheller/cube

Conflicts:
	settings/index.php
	templates/page-login.tpl
switch to laravel4 php framework

the whole page is now set up on the laravel4 php framework
changed app url to live system
gitignore changes
project setup fixes
gitignore
laravel framework fixes
implemented websocket connection into dashboard
basic ws communication implemented
fixed websocket communication
updated readme
updated readme
updated readme
updated readme
updated readme
updated readme
updated readme
improved websocket js-client
websocket