added nicEdit
Merge branch 'master' of github.com:SanyaBogos/TravelMapOnlineNew