added our-view spotlight module to styleguide
fixing conflicts