Add PopupLayer.
Merge remote-tracking branch 'origin/master'
Update popup code.
Merge remote-tracking branch 'origin/master'
Update popup code.
Merge remote-tracking branch 'origin/master'
Finish PopupLayer.