added no screenshot image,fixed minor bugs
Task 150
Merge TFS Changeset 333