update
add Position optimization in white board
add clear function in whiteboard
add Canvas view class
Merge branch 'feature/room' into front_dev

Conflicts:
	app.js
	public/javascripts/app/module/canvas.js
	public/javascripts/app/module/socket.js
update
update
fix newconnect bug
Merge branch 'front_dev_temporary' into front_dev
mod twitte callback url
fix feature of socket.js
remove websocekts to adjust heroku feature
herokuからnodejitsuへの移行