Take screenshot
screenshots are stored in Images directory and frame property has been added to template.xml
Fixed merge conflicts, preparing to push