Merge pull request #330 from cmiles74/master

Master - OpenLayers 3 Map
Merge branch 'master' of https://github.com/wicketstuff/core