Merge pull request #5 from 8indaas/master

added templates screens
added tags to images in templateview