adding add/edit windows
xMerge branch 'master' of github.com:benoitfragit/google2ubuntu