Merge pull request #2360 from colegleason/qr-code

Made QR code valid JSON. Fixes #2354
Merge pull request #2403 from HabitRPG/sabe/fix

Misc UI fixes
#2384 add alert on paypal taking a long time to clear
Merge pull request #2319 from HabitRPG/sabe/preferences

Finish up @wc8 suggested user preferences: tags and Advanced Options
fix(#2375) merge in @SabreCat's stats.jade changes "More elegant
show/hide setup for attribute bonuses"
Change static module name to habitrpgStatic.

The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
Remove references to $rootScope.Shared & .Content in non-view code.

Instead, have them request services that return them so tests don’t need to prepare special state.
Actually wait for Selenium to start.
Rewrite API tests in normal JS.
Update README to account for API tests in JS.
chore(changelog): add commit-msg hook to verify commit messages

This adds a Git commit-msg hook which runs after a commit message is
written. It verifies that is matches a certain spec as defined by the
AngularJS document here:
https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
This will allow for autmoated generation of Changelog.md in the future.

Migration notes: Please run `ln -sf ../../validate-commit-msg.js
.git/hooks/commit-msg` to install the commit hook.
chore(changelog): add git-changelog config and sample CHANGELOG.md

This is the setup for the Grunt task that generates a changelog. Note
that it currently generates the changelog for the range
changelog-start..HEAD where changelog-start is a tag. It will always use
the most recent tag it can find. We may want to change this
behavior. Also, the original repo has some bugs, so I'm using my fork
until he accepts my PRs.

Migration notes: To run: `grunt git_changelog`
feat(challenges) markdown in challenge-descriptions
feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason)
Merge pull request #2396 from aughr/andrew/consolidate_tests

Convert API tests to normal JS
chore(archived tests) Moving unused tests, casper stuff, and
api.mocha.coffee into archive directory. we could depend on git history,
but I want to keep them publicly visible to developers for now since
they may contain valuable test worth porting to our new
setup.
Fixes misuse of food.key in modal display and instead uses the text value
Fix #2438

Bosses damage you for party members' misses, not your own undone Dailies, while you're in the Inn.
generifies article for food when feeding to pet
Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert'