merge kota
Merge branch 'master' of github.com:4ega/jameson

* 'master' of github.com:4ega/jameson:
  add popup