fixed merge problems
fixed merge problems
Merge branch 'development' of https://github.com/KevinThielen/Komana into 1_DeadlinePriority
added columns to tasks
Added pagewrapper style to new_conversation
Merge branch 'development' of https://github.com/KevinThielen/Komana into development
Visual bugfixes in Dashboard
fixed auth problem
Merge branch 'development' of https://github.com/KevinThielen/Komana into development
distance_of_time_in_words is now available for future an past in german translation
Added 'weak gear' to show_project
Added free task count to dashboard
Added partials
Added partials for tasks and changed route
Defined CSS for clickable user view
solved merge conflicts
Merge branch 'development' of https://github.com/KevinThielen/Komana into development
Added Settings Menu
Added UserBatch to Tasks in Show_Project
Fixed Bug: UserBatch showes wrong attached user in task