Updated framework to 201404 date/version: 5/19/2014
Re-added custom templates