added showcase and spotlight page example
fixing conflicts