local copy of openlayers.js used.
First commit on secondary annotation, backbone view. Add secondary button not yet hooked up.
Merge branch 'master' of https://github.com/catami/catami