document viewwer added
merge completed with ashwin changes