logs change
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/assets/javascripts/angular/services/socket.js