Added a second message under the "rest at the inn" button, explaining how the inn interacts with boss fights.
Add custom css to prevent Flying Pig progress bar being hidden
added spacing for member modal
Update API footer link

The Wiki page here on Github is quite useless now, the most useful infos are in https://habitrpg.com/static/api an the official Wiki
Merge pull request #3002 from Omnomnobot/patch-2

Update API footer link
Merge pull request #2987 from thepeopleseason/member-modal-spacing

Member modal spacing
Merge pull request #2874 from lorian/inn-text

Added a second message under the "rest at the inn" button, explaining ho...
fixed &nbsp;/space issue
Merge pull request #3044 from thepeopleseason/member-modal-spacing

Member modal spacing fix's fix.
Add custom css to prevent Flying Pig progress bar being hidden
Merge branch 'develop' of https://github.com/benmanley/habitrpg into develop

Conflicts:
	public/css/inventory.styl
fix(seed): all groups must have a privacy
Merge remote-tracking branch 'upstream/develop' into develop
chore(cluster): set max #cores to 1 for now (we're maxing memory again)
added provisioning and removed need for direct DL
chore(package.json): upgrade karma-requirejs, fixes #3061
Redesign navbar

Restyle navigation and improve mobile layout
Remove flying pig custom styles

Remove styles that haven’t been pulled into habitrpg
Change navbar background-color

Correct navbar background-color and remove some redundant styles
Change hardcoded text to variable