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

Conflicts:
	app/assets/javascripts/angular/templates/dashboards/index.html.erb
just title change for log to "Manage Logs", "My logs"