updated from dev
added template file viewing plugin
Merge branch 'prod' into dev
plugins updates
updated wp core to 3.6