all popups done
Merge branch 'master' of https://github.com/proto3/Manhattan.git