implemented angular .resolve
creating new Logs from dashboard
fixed database query on categorize
resolved conflict