Modify templates for ink framework
Added tag INK Port for changeset f6bee053e3be
Fix Smarty3 crash
Sync with master on github
Merge with github