removing comments in code
Merge branch 'socket.io' into develop
changing HABTM association