prepare to pull
Merge branch 'master' of github.com:berc-web/berc_web
form macros
Merge branch 'master' of github.com:berc-web/berc_web
update db
wire up files