parent category feature and rss blog line in main
conflicts resolved