Split main.json
Fix version conflict
Fix version conflict
Market "Sell..." button: add spaces, remove bracket

Fix some text appearance issues:

- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".

- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see https://github.com/HabitRPG/habitrpg/commit/4f07ab39b0868764c665bbf914474745e11ecc32

- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
Replace hard-coded strings for env.t on drops.jade file
Remove duplicated 'none' and minor adjusts
Merge pull request #2600 from Sinza-/envt-drops

Replace hard-coded strings for env.t on drops.jade file
Merge pull request #2605 from Sinza-/split-fix

Remove duplicated 'none' and minor adjusts
Merge pull request #2583 from Sinza-/split-main-json

Split main.json
feat(marketing): some frontpage updates, a screenshot, & "contact us"
button mods
feat(marketing): add video tuts on "learn more" page until we have some copy
Merge pull request #2591 from Alys/patch-2

Market "Sell..." button: add spaces, remove bracket
chore(bailey): add bailey for group plans + perfect day achiev. Keep
basic-plan announcement up for a bit longer
chore(bailey): add announcement re: STWC processing time