fixed application.js and turned listing layout for dashboard into dashlisting partial
API working
Resolved conflicts
Fixed routes typo
merge conflict in dashboard