Log socket change
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/controllers/logctrl.js
	app/assets/javascripts/angular/services/socket.js
clone book
Merge remote-tracking branch 'ta/master'
Raj's changes.
fix dashboard page