* adding support for separate edit and delete permissions to the tile directive.  edit defaults to cmf.ModifyPortalContent, delete defaults to same as add

refs #173
 * on second thought, edit should simply default to whatever add is

refs #173
missed the new icon param passed when doing the merges
adding missing changelog entry for pull request
Merge branch 'master' into deco-lite-fixes
Fix edit_permission and delete_permission to default to add_permission only in TileType constructor; Fix argument order in directive