Added perm and settings form
Added custom_blocks module
Merge branch 'master' of https://github.com/JasonSafro/ami_hot-dog