added category, needs, schedule and some templates
fixed conflicts