Synced oskari.org and sample servlet index.js
Merge branch 'develop' of https://github.com/nls-oskari/oskari into develop