Included ol3-beta2. Minor improvements + bugfixes

Fixes #1