Update to newest trunk version of ol3. Make adaptions as needed