Organization with failed address is saved now

A lot of work was done by Michael (he wrote scenarios and steps for cucumber), but I ran into problems with git and decided to resolve all this stuff manually - so all the work is organized in 1 commit. The changes were rolled on the latest upstream: it should be easy to merge. Sorry Michael, that there is no your commits in history.
EDITED: I've just seen, that changes from the lastest commit would be rolled backed by mine, if there will be any troubles with merging, I'll resend new pull request.