Fixes some {icon} smarty function features...text=notext is equivalent to passing img=action.png, changed noaction param to action=scriptaction to give us an href=# for javascript use,
Updates sample db for 2.2.1