futher changes to the remove account bug
Merge branch 'master' of git://github.com/asm-products/octobox into some-bugs