changes
Merge branch 'master' of http://github.com/jonathanysp/teamQuality
Merge branch 'master' of http://github.com/jonathanysp/teamQuality
Merge branch 'master' of http://github.com/jonathanysp/teamQuality

Conflicts:
	nodejs/public/js/socket.js
Merge branch 'master' of http://github.com/jonathanysp/teamQuality

Conflicts:
	nodejs/public/js/socket.js
Merge branch 'master' of http://github.com/jonathanysp/teamQuality

Conflicts:
	nodejs/public/js/socket.js
Merge branch 'master' of http://github.com/jonathanysp/teamQuality