updated test viewer to show xml gpml
merge from dev