changed the index file---release1
conflicts resolved
laster master