initialized active_admin
added user and project to activeadmin
removed create from active_admin
solved merge conflicts like a pro
moved activeadmin.css to vendor
Merge branch 'development' of https://github.com/KevinThielen/Komana into 1_Active_Admin
commit before merge
merged development on master for heruko
changes for Heruko
Indexpage can now be displayed without redirect
Urgent tasks is now displayed properly
Free tasks are now displayed properly
Merge branch '1_Minor_Changes' into development
Merge branch 'development' of https://github.com/KevinThielen/Komana into 1_Active_Admin
Fixed problems with datepicker not working correctly
Error message on creating a new project is now displayed properly
made /admin/users view clearer
Delete active_admin.css.scss
Merge branch 'development' of https://github.com/KevinThielen/Komana into 1_Minor_Changes
Conversation can not be startet without excisting user anymore