added some sorting functionality to weekedit
edited popup menus
made weeks mergable