some text edition
startetd rebuilding for use with Web Storage
Merge branch 'admin.fka'