Merge pull request #5 from paulyi326/master

started implementing socket.io
added first version of event functionality to potentialEventsCtrl
Merge pull request #6 from albreyb/master

added first version of event functionality to potentialEventsCtrl
changed some stuff
Merge branch 'master' of https://github.com/paazby/ice-client

Conflicts:
	www/index.html
	www/js/app.js
	www/js/services/oAuth.js