areas.js refactoring
Merge remote-tracking branch 'origin/master'
bugfix z-index