add hack for avoiding address_1_error
remove previous commit
Merge branch 'master' of github.com:pawl/CalendarAdmin