popups added
Merge branch 'vadim' of https://github.com/coderiver/rafaello