updated template
updated versions
Updated Frame
Merge pull request #24 from xopherdeep/admin-iframes

Admin
Merge pull request #19 from xopherdeep/master

Trunk Merge