allow form.action to have icons
Add cms edit icons
Merge branch 'master' of github.com:whythawk/hrd
Fix merge fuckup