Place link to Markdown help prominently in Tavern chat (fix #1906)
Consistent formatting of markdown hint in group edit fields
Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off.
Correct and clarify some details on contributor rewards
Change Markdown help link to point at HabitRPG wiki
Fix a few typos/inaccuracies in English app.json
fix for multiple guilds creation
Update Contributing.md

Correct link to userID on wikia and make a few grammatical & punctuation changes.
emoji works, huzzah. addresses #681, #1840, and some discussion in #1908
pointed to new repository with minifiable code for emoji parsing
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it
remove emoji css from manifest and move into index.styl
add emoji.js file to tests, fix travis build
Merge pull request #1925 from bobbyroberts99/patch-1

Update Contributing.md
re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!)
Merge remote-tracking branch 'origin/sabe_tweak' into develop

Conflicts:
	views/options/social/tavern.jade
thanksgiving turkey & npcs
Merge branch 'thanksgiving' into develop
thanksgiving: newstuff too